Merge pull request #2 from gpmcadam/day-span-fix

Better handling of day changing
Merge branch 'master' of github.com:gpmcadam/awesome-hamster

Conflicts:
	awehamster.py
cleanup formatting

add: 'before' and 'after' params to allow custom appearance
change: remove 'span' style; allow the user to colour the widget using 'b' and 'a' attributes
change: cleanup foramtting code, putting attributes on new lines to make it slightly more readable
Merge pull request #4 from gpmcadam/formatting-cleanup

cleanup formatting
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	awehamster.py