added .vimrc to folder and setup script
added .swp to ignore
merge setup.sh