Adding perlcriticrc
Updating readme
Adding cc
Removing cc
conky
Merge branch 'master' of https://github.com/jprjr/dotfiles
Updating vimrc
Adding some cool new stuff
Adding pyenv
Merge remote-tracking branch 'gitlab/master'

Conflicts:
	makesymlinks.sh