Move iterm related stuff into subdir, vimrc updates