Merge pull request #66 from KyleW/eric

Bug fixes
Actual bug fix with restarting presentations this time.
DJ starting over debugged for reals