some old local code that was never commited, clean up before branching
Merge branch 'master' of github.com:kevinmarsh/kevinmarsh due to changes on the server and local