Merge develop to master

Switched over the GLUT_Plotter, started making changes, etc.