Moved structure to avoid import conflicts when including ossos.storage.
Merge branch 'master' of https://github.com/ijiraq/MOP
Fix bug in display of fields without discovery triplets. Move populate_ossuary out of the egg so it doesn't trigger on server restart.
Merge branch 'master' of https://github.com/ijiraq/MOP