Update for grunt and bower
Merge branch 'master' of https://github.com/kubrickology/ElsevierBoilerplate

Conflicts:
	bower_components/foundation/scss/foundation.scss