Fixed some things
Merge branch 'work' of github.com:dedmons/dotstuff into work