Stuff.
Merge branch 'master' of github.com:sixohsix/env

Conflicts:
	.emacs