Misc changes
Merge branch 'master' of github.com:suderman/local