Fermi and Non-Fermi Liquid Behavior of Quantum Impurity Models: A Diagrammatic Pseudo-particle Approach