Resolve conflict in doc string
Merge branch 'master' into diff-markers

Conflicts:
	makePlan.py resolved by deleting redundant diff markers
Move imports to the top

sys is needed to create args, so I've moved it and all other imports to
the top of the file, i.e. right after the docstring
Merge pull request #26 from sinisterstuf/diff-markers

Resolve conflict in doc string