Merge pull request #238 from jamiehannaford/server-rebuild-opts

Introducing RebuildOpts