more updates
updated
Merge branch 'master' of https://github.com/dhuang6/depot-rails4