Update config files
Merge branch 'master' of https://github.com/plumzl/config

Conflicts:
	vimrc
vimrc changes

 * Switch colorscheme to solarized
 * Limit text line to 79 characters instead of 80
 * Add trailing whitespace handling