Drop Powerline
Clean up amethyst
Add Emacs
Clean up Vim ]
Update iterm