updated with correct naming scheme
Merge branch 'master' of github.com:griffithchaffee/rails-infrastructure