Added taskpaper
Merge branch 'master' of https://github.com/jonasdiemer/dotfiles

Conflicts:
	home/.vimrc