Staging also uses Postmark API key from secrets; no need to override
Update Guardfile based on acceptance -> features reorg
Bootstrap scripts are now provided by separate rbenv-bootstrap plugin
Use latest guard-rspec template
rails new rails-starter -d postgresql -T (3.2.12)

Note that starting with this version I am using the `-T` option to exclude Test::Unit files.
Merge branch 'rails-new'

Conflicts:
	Gemfile
	Gemfile.lock
	README.md