set columns to 180
set columns=180
conflict
Add jproperties into expandtab
Add install.sh
Merge branch 'master' of github.com:aleafs/vimrc