Added conky
Merge branch 'add-conky'
Remove cdpath, its too annoying
Google AppEngine SDK
Merge branch 'master' of github.com:CraigJPerry/dotfiles
Google AppEngine SDK
Merge branch 'd1' of github.com:CraigJPerry/dotfiles into d1