fix some things
Merge branch 'master' of ssh://github.com/chrismiles1985/dotFiles