Clean up GR branches

[haykh]

@alisagk @bcrinquand could you guys clean up the GR branches and merge into one? ideally, a working version would be merged into dev/latest. Also, we'll need to remove the output files from the commits (see data/)