misc
misc
added vim install to install_software script
added python installation scripts
resolved conflict