Some misc. tweaks and fixes
https://issues.jboss.org/browse/APIMAN-132
Merge pull request #23 from EricWittmann/APIMAN-132

https://issues.jboss.org/browse/APIMAN-132