Updates and fixes
Merge
updates to run locally.
Updates to fab and settings.
Merge pull request #13 from dstegelman/feature/fixes

Updates and fixes