set tab/spaces based on filetype
update vimrc to use vundle
Merge remote-tracking branch 'origin/master'