Update inherited resources gem
Add unique: true index to username
Rename User#username to User#name
Merge branch 'master' of github.com:jmuheim/base