moving things around to get ready for python server stuff
Merge pull request #13 from thequbit/master

moving things around to get ready for python server stuff