small update to .bashrc
adding human-readable sizes as default ls
large update to .vimrc to normalize formatting options
also adding human-readable sizes to standard ls
Merge branch 'mac'

Conflicts:
	.bash_profile
	.bashrc