derp I can totally remember to finish my sentences
Hours/day now truncated to two weeks, because it was getting kind of

absurd for several users.
Adds sleep time; minor changes to calculation of wake times.
Merge branch 'master' into wakeup

Conflicts:
	sleep/models.py
Cleaning that merge up a bit
Merge branch 'master' into wakeup
Merge pull request #13 from sleepers-anonymous/wakeup

Wakeup -> Master