Merging in code build
Testing the heroku buildpack option
Merge branch 'code-build'

Conflicts:
	.gitignore
	Gruntfile.js
	package.json
Moving sass grunt task around to see if that helps with running task on Heroku
Adding the copy task as well
Reverting back to things before dabbling with Heroku BUILD packs