ATP as a bundle and some fixes in vimrc