Merge pull request #478 from vicnet/master

Indent and reorder parser for clarity
fix issue with gcc 4.4.5. pointer to renderer in export_png segfaulted
worked fine in clang
fix camdist test, issue #430