Fix deploy
Merge pull request #206 from Gizra/fix-deploy

Fix grunt deploy
Fix bower resolution
Merge branch 'master' of https://github.com/Gizra/negawatt-server into 207