cleanup
Merge branch 'master' of github.com:afitterling/rails4base into develop