added stuff from Drews vimrc after attending his class
merge