added uglifier
fixed syntax error in menu.scss
fixed sass issues
fixed sass issues
took out simple cov from bin/rails
resolved some merge conflicts and also heroku fixes as well