fix river point order
more combplot converter
expose variables using all c styles
Merge remote-tracking branch 'origin/master' into byu/plot
Merge pull request #414 from twosigma/byu/plot

Merge after confirming `gradle check` passed