Merge branch 'master' of bitbucket.org:samop/trisurf-ng with work done on r...

Samo Penic

2016-05-25 aafd67f2d592799167864698ea07eb8aadcc86a7

test/parsecmdline.c does not exist in tree 8dc37f8def2d9e3d658b8900d04decfdc96bba14