Fixes issue #27 Separated the merging and auth a bit, prevent a bug where you could get stuck in a pseduo merge loop (I'll use this word in the my next scheduling meeting)
Version bump
Merge branch 'master' of github.com:destinygg/website