Proper definition of XDG dirs
Merge branch 'master' of github.com:TimeIPS/dotfiles

Conflicts:
	home/.bashrc