update for linux
Merge branch 'master' of https://github.com/dpranke/dotfiles

Conflicts:
	.bashrc
	.subversion/config