v0.6: Tidy up merge

Resolved all conflicts, restored mrgaze_*.py scripts