Added updating and resourcing of vimrc on the fly
Removed scratchpad, since I wasn't using it
Merge branch 'master' of github.com:smcabrera/castillo-cabrera

Conflicts:
	home/.vimrc
Fixed vimrc to load from the original file instead of symlink
playing with colorschemes