Remove that hash rubbish
Merge branch 'master' of github.com:rey/.dot

Conflicts:
	bashrc