set ruler for .vimrc
accidentally commited to wrong branch
Merge branch 'mac_config_files'