fixed conflicts
improved gitignore
Merge branch 'master' of github.com:hoylemd/homedirscripts

* 'master' of github.com:hoylemd/homedirscripts:
  ignoring old gitconfig
  reconciled vimrc conflicts
  better gitignore
  javascript stuff for vim
  general improvements
  made tabs 2 spaces

Conflicts:
	.gitignore
added ssh-agent