finally got around to updating my linux dot files
Merge branch 'master' of https://github.com/claytin/linux-dotfiles

Conflicts:
	README.md