Merge pull request #29 from cmanou/master

Missing imports
Fix kwargs typo
Change bp typo
Unit tests pass, everything has changed
Merge pull request #30 from mdmoss/master

Add enough functionality for o-week
Fix error in event views