added perlcritic
Merge branch 'local'

Conflicts:
	vim/vimrc
added colorscheme solarized to vimrc