merging from hub at work..
Merge branch 'master' of https://github.com/lwm/dotfiles