Moved useful features from Lightning to SimpleSetup
Changes from Ioan review
Merge pull request #22 from davetcoleman/simple_setup_improvements

SimpleSetup Improvements