ssh config and removing .ds_store
updating git ignore
Merge branch 'master' of github.com:ritcheyer/dotfiles

Conflicts:
	.DS_Store