Update from
Add scimed dotfiles
Ignore .vim directory
Merge branch 'master' of https://github.com/akofink/dots

Conflicts:
	.gitignore
	config/.vim/autoload/pathogen.vim
	config/.vim/ftdetect/jar.vim
	setup_osx.sh
Add scimed gitconfig