added Rails defaults
Merge branch 'master' of github.com:christiannaths/preferences