Added production folder to .gitignore
Changed precedence of environment variables
Altered JavaScript code after JS Hint told us to do so
Added Grunt for building
Merged conflicts