prevents git from displaying ^M at end of dos files when diffing
pressing enter in normal mode now syncs syntax highlighting in vim
adds global ignore for tags files
adds ssh-agent startup to bash_profile
merge conflict
merges in ssh agent stuff