Merge pull request #24 from benjimarshall/master

For #22 and for #23, an overhaul of sys.md for argument parsing