Added simplejson as Jython2.5 does not contain json-#10

From https://github.com/simplejson/simplejson : "simplejson is the
externally maintained development version of the json library included
with Python 2.6 and Python 3.0, but maintains backwards compatibility
with Python 2.5."
Tidy diffcalc.ubcalc before move to json and refactor - #10

From https://github.com/simplejson/simplejson : "simplejson is the
externally maintained development version of the json library included
with Python 2.6 and Python 3.0, but maintains backwards compatibility
with Python 2.5."

Conflicts:
	test/diffcalc/hkl/you/test_calc.py
A 'newub' call with existing ubcalc no longer loads it
The loadub command now restores the ubcalculation if either or0 or or0
and or1 were used to calculate it
Filled out ubcalc restoration unit tests and made ubcalc's reflist
private and Relection class private
Moved UCalculation persisted attributes into a common UBState object to
aid future persistence and streamline code.
Created a UBCalculationJSONPersister json persister
Refactored UBCalcState and associated persistance code into
hkl.ub.calcstate module
Merge remote-tracking branch 'origin/ubcalc_storage'

Conflicts:
	diffcalc/ub/calc.py