Cleanup
More cleanup
Merge branch 'master' of https://github.com/Geekly/fieldmarshal