Refactor notifications
Merge branch 'master' of https://github.com/stayradiated/Nitro