homeshick compatability
Merge branch 'master' of https://github.com/mgperry/dotfiles