Update template
Merge branch 'master' of github.com:jbussdieker/rails_template