Merged in .emacs settings from laptop.
Git config merges from laptop.
Added pystartup. Colored prompt does not work well in py3.