Fixed stuff that is different between computers
Merge branch 'master' of github.com:stphndemos/dotfiles

Conflicts:
	install.sh