Split energy graphs into energy and energy mode.
Merge branch 'master' of github.com:edmundhighcock/gs2crmod
Merge branch 'master' of github.com:edmundhighcock/gs2crmod
Added write_in_z flag for SpectroGK.
Added write_in_z flag for SpectroGK.
Merge branch 'master' of github.com:edmundhighcock/gs2crmod
Applied patch for changes made on Iridis.