Clean Up Gemfile
Bring in bootstrap css
Forget Edge Rails
Merge branch 'dev'
move back rails 3
Merge branch 'dev'
Add Haml Rails
Merge branch 'dev'