fixes and extra doc
Merge branch 'master' into changes

Conflicts:
	salted-rails.gemspec