manually merged jon and brandon's grunt stuff
git ignored the app/css and build folders since grunt creates all their contents