rails new rails-starter -d postgresql -T (4.0.5)
Merge branch 'rails-new'
Merge branch 'master' into bootstrap