fixed merge conflict synthax errors
updated bower related scripts
added hook api url
Merge branch 'master' of github.com:XivicSilver/internal-deploy
hooks tests
Merge branch 'master' of github.com:XivicSilver/internal-deploy
deploy stuff