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
And actually working, at last :D
Fixes sleep-entry UI to be based on date/month/year instead of just date
Merge branch 'master' of github.com:sleepers-anonymous/zscore
Added quote
Merge branch 'master' of https://github.com/sleepers-anonymous/zscore
Adds field for time zone. And migration
Lets users edit sleeps such that they overlap, but warns them.
Remove the print statement, lolz
Merge branch 'master' into wakeup
Moves charts up on creep page.
Merge pull request #13 from sleepers-anonymous/wakeup

Wakeup -> Master
Rearrange creep page to move graphs up and take advantage of screen
width
Makes forceOverlapping not required.
Rearranging friends page to bring the search bar to the top
Add sleep start/end time graph