Added heroku app name to readme
Cleaned up gruntfile
Merge remote-tracking branch 'origin/master'