some fixes for windows
come back after update
added 2 themes
updates on vimrc
Merge branch 'master' into imag

Conflicts:
	vimrc