Fixed date format in conky.
Updated terminal name.
Merge branch 'master' of github.com:ayekat/dotfiles

* Forgot to pull before committing.