Added notifications and fixed some bugs
Merge pull request #34 from seancavanaugh/notifications

Added notifications and fixed some bugs