Tidying up some things
Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings