mac changes
Merge branch 'master' of github.com:chronoslynx/dotfiles
updating things. starting to organize
updating to latest
Merge branch 'master' of github.com:chronoslynx/dotfiles

* 'master' of github.com:chronoslynx/dotfiles:
  added conkyrc and got rid of compiled/intermediate files