Striving to make things clearer.
Merge branch 'ajp_dev' into development

* ajp_dev:
  Minor updates.

Conflicts:
	source/Blimey.cs
Updated to work with the changes to Abacus.
Refactoring.
Big work in progress refactor.