More **kwargs for unified sleep; still not nearly done.
And more changes
Merge branch 'master' into pretties
Merge branch 'master' into pretties

Conflicts:
	sleep/templatetags/sleep_tags.py
Cleaning up the merge
Adding the sleep view table .html
Merge branch 'master' into pretties
Tablelifies the forms
Merge pull request #15 from sleepers-anonymous/pretties

Pretties