Merge pull request #152 from RyanTG/master

notice and alert update
is_machine_admin flag for users
Merge branch 'enhancements'
Revert "trying some moz specific styles, then will check on windows/moz"

This reverts commit 52e37df25730ffbd89484811d4238e71e76916ca.
nav style updates