fixed extra notifications that were sent.
Merge pull request #122 from kmabey/LocalDev

fixed extra notifications that were sent.
Merge pull request #123 from kmabey/dev

Dev