Sort Gemfile
Update to Ruby 2.1.0
Add haml gem
Switch erb files to haml