--Added a test to check that bishop = 4 for Miller geometry
Version bump to 0.12.0
--Rolled back accidental minor bump
Version bump to 0.11.53
Regenerate gemspec for version 0.11.53
Merge branch 'master' of github.com:edmundhighcock/gs2crmod

Merging remote changes

Conflicts:
	gs2crmod.gemspec
Version bump to 0.11.54
Regenerate gemspec for version 0.11.54