update gems
Merge https://github.com/jehughes/rails3-devise-bootstrap-example