Fixing bug in NPM and Bower dependency installs
Merge branch 'master' of https://github.com/DoubleDome/mashup