Merge pull request #24 from mkelderm/master

Added 3 features/bugs
small fixes
unit tests for FMW
unit test fix
unit test  fix for puppet 2.7
puppet lint