Github for Windows hates me! OMG! I wanna rollback but you won't let me.
Merge branch 'master' of https://github.com/frankhale/aurora