Add conventional models directory to app template
Merge branch 'master' of github.com:chrismccord/phoenix
Clean up keyword lists