comment out action_mailer config
update twitter-bootstrap-rails gem
regenerate bootstrap js/css
update markup for bootstrap 3.2
Merge branch 'feature/upgrade-bootstrap'
update gems