ls modification human readable
Merge branch 'master' of github.com:uZer/.schematics

Conflicts:
	vim/vimrc
adding vimrc change