Update phoenix_haml and linguist for 0.15.0
Merge branch 'master' of github.com:chrismccord/phoenix