SO MANY CHANGES I DONT KNOW WHERE TO START
Merge branch 'master' of http://github.com/jakedarling/magicflight