added sanity step
initial parsing, still missing crucial code
support for configfiles and simple unittest
added choice support and test of choice + store_or_None
cosmetic changes
added clarification and removed intermediate variable
cherry-pick aa0473d12b84c03a759d39c145a7cd8f2c87b051 and fix conflicts