Fix it so we use the switching rules defined in OSMF, which include the emergency rules.  This is easily done by removing our override.  Also some cleanup.
Merge remote-tracking branch 'upstream/master'
Some cleanup flagged by static code analysis.  Also removing the Utils file, since it seems like the "utility" folder has sort of morphed into a general home for that.
Merge pull request #68 from jnoring/master

Use switching rules defined in OSMF, some code cleanup, etc.