Merge pull request #31 from johnpapa/develop

Develop
Merge pull request #32 from johnpapa/develop

wiredep for karma