Local changes
Merge branch 'master' of leeping.stanford.edu:/home/leeping/git/etc

Conflicts:
	emacs
	vmdrc
Added proclus
Merge branch 'master' of leeping.stanford.edu:~/git/etc
Merge branch 'master' of github.com:leeping/etc

Conflicts:
	bashrc