Ignore .orig files.
Fix issue of trying to add duplicate items

when importing a project

Fixes https://github.com/OctopusDeploy/Issues/issues/1192
Support named groups of options, and added dump-deployments command
Merge remote-tracking branch 'origin/develop'

Conflicts:
	.gitignore