Various small updates; improvements to commandline argument handling.
Merge branch 'development' of https://github.com/rogierpennink/CannoliMVC into development