sam's stuff 4/30/13
Merge branch 'master' of https://github.com/fsxfreak/Civitatem