New fresh prelude, and have jedi (python) working
Packages: AucTeX, EIN, reformat
Activate electric-indent-mode (Auto indent newlines)
Ignore cookies stored here
Merge branch 'master' into rock-mac
Merge branch 'master' into rock-mac

Conflicts:
	vendor/ESS
	vendor/igor-mode
Remove and untrack completion history, a noisy file
Merge branch 'master' into rock-mac
Now tracking custom.el
Added tabula-rasa mode, modified to preserve colors
Chmod on tabula-rasa
80 column wrap by default
ESS submodule update
Updated ESS
Merge branch 'master' into rock-mac

Conflicts:
	core/prelude-packages.el