Updated conkyrc
Merge http://github.com/callumgray/dotfiles
Updated README.md online