Changed aliases
Merge branch 'master' of https://github.com/mattattaque/dotfiles

Conflicts:
	.Xresources
Added ssh config