Committing before big pull
Merge branch 'master' of https://github.com/ksthar/linux-config

Conflicts:
	.vim/.netrwhist

Fixing merge conflicts
Added dircolors command for cygwin