Added additional command line stuff including commons cli support.
Merge origin/master into morefix