more changes to better stuff
Merge branch 'master' of github.com:dougmiller/theMetaCity

Merging both remotes togeather. I think.