order directives
normal clock settings
Merge branch 'master' of github.com:jblomo/dotfiles

Conflicts:
	spectrwm/conkyrc.symlink
autostart dropbox and xscreensave