Moved some things around and fixed cors.
Merge branch 'master' of https://github.com/metafedora/pirateshift