Finished adding soe command line options to the skeleton
Merge master into snapSkeleton