Various tweaks to enable jedi and auto-complete.
Merge branch 'master' of http://github.com/jameszuccollo/prelude

Conflicts:
	personal/jztweaks.el