Bump version
Merge branch 'master' of github.com:chrismccord/phoenix