Lots of changes to my emacs files. Also a few changes to .profile,
etc. for python support.
Merge branch 'master' of github.com:andrewscharlie/preferences

Conflicts:
	emacs/.emacs.d/elpa/archives/gnu/archive-contents
	emacs/.emacs.d/elpa/archives/marmalade/archive-contents
	emacs/.emacs.d/elpa/archives/melpa/archive-contents
	emacs/.emacs.d/init/common.el
	terminal/.bash_profile
	terminal/.bashrc