Merge branch 'master' into hub/master

Manually removed a secret key from config/initializers/secret_token.rb.
Not too familiar with Rails so I don't know best practices for that.

Conflicts:
	.gitignore
	README.md