Misc
Merge branch 'master' of github.com:prickett/gitrepo
Misc changes