Fix ipython file after merge
Remove garbage from vimrc; Update whitespace suppression config