Update to latest Gems
Update to directly require haml & sass
Merge branch 'update_gems'