large refactor of organization level default system info keys

the purpose of this refactor was to allow for other objects in the
future to have org level default custom info keys.

fixing busted system test

fixing cli nosetests

shortening some lines to make pylint happy

still fixing rspec tests
Merge pull request #1716 from komidore64/custom-info

large refactor of organization level default system info keys