Fixed indentation in integrator, #794
Added new integrator base class, #794