Set up an automated build process using Grunt

Grunt is a Javascript Task Runner. Instead of manually running tasks like compiling .scss files, concanitating and minifying .js files, we let Grunt handle this for us.

Instructions on how to get started will follow in next commit.
Fixed minor merge conflict