fEMR makeover and bug fixes
Merge pull request #281 from kevinzurek/feature-femrRestyle_rebased

fEMR makeover and bug fixes