Updated some stuff to keep Lint happy. Notifications are no longer enabled by default
Merge remote-tracking branch 'origin/master'