Merge branch 'master' of github.com:truerenton/dotfiles

* 'master' of github.com:truerenton/dotfiles:
  refactoring
return OSX rubberbanding