tat
qMerge branch 'master' of github.com:Liberationtech/ltconfiguration

Conflicts:
	setupsymlinks.sh
	vim/dotvimrc_basic