post review fixes, spacing, updates from datazilla
fixes, merges, all tests pass
more merge fixes
merge post review fixes
merge conflicts
more merge anomolies
Merge branch 'merging140103'