Hyphenated app names will be camelized properly.  resolves #2
Merge with Adrian's changes