Merge branch 'master' into develop
Modified .gitignore to allow for secret_token.rb

Was originally ignored because a static secret_key_base was used.
The secret_token.rb file now initializes a random secret_token to
use.
Merge branch 'develop'