whitespace and minor fixes
Merge branch 'master' of github.com:enjoylife/dotfiles