Updated human-readable rendering
Added json_pretty to output formats, fixes
Relaxed mixin Regexp for OCCI-OS
Merge pull request #5 from arax/tmpl_occi_os_fixes

OCCI-OS support in human-readable rendering + minor fixes and tweaks