Modifications on vimrc.

1. Added filetype specific mappings for vim and markdown.
2. Defined folds for vimscript files and vimrc
Reenabled colorscheme desert
Clipboard will now use * instead of + register
Merge branch 'master' of github.com:JALopezSilva/dotfiles

Conflicts:
	vimrc