rails new rails-starter -d postgresql (3.2.11)
Merge branch 'rails-new'

Conflicts:
	Gemfile
Update all gems
Add livereload gems
Install livereload
Follow standard naming convention for sprockets and livereload