Added an isActive flag to the sys admin query.

Fixed #905
Added a test into ERR_Handler_TEST and fixed a query I missed in
ERR_Notifier
Merge pull request #1000 from kbromer/feature/905-notification-emails

Added an isActive flag to the sys admin query.
Revert "Added an isActive flag to the sys admin query."
Merge pull request #1001 from SalesforceFoundation/revert-1000-feature/905-notification-emails

Revert "Added an isActive flag to the sys admin query."
Whitespace cleanup
Comment text
Merge pull request #1004 from kbromer/feature/905-notification-emails

Feature/905 notification emails
Merge branch 'dev' of https://github.com/SalesforceFoundation/Cumulus into dev

Conflicts:
	src/classes/ERR_Handler_TEST.cls
	src/classes/ERR_Notifier.cls
Seems like some changes were lost when I manually resolved the conflicts related to branch 905-...
Merge pull request #1006 from SalesforceFoundation/feature/fixing-dev-20140903

Seems like some changes were lost when I manually resolved the conflicts...
Merge branch 'dev' into feature/883-hierarchical-custom-settings-2

Conflicts:
	src/classes/ERR_Notifier.cls