made the class names in model_loading.py compliant with the ones used in models.py
fixing up the dataset loading after ome merger
Merge branch 'P0N3Y-master'
undoing some changes pierre made
Merge pull request #5 from SBRG/sbrg

undoing some changes pierre made
minor bugfixes
Merge pull request #6 from aebrahim/aePR1

minor bugfixes
fixing up dataset_loading
Merge branch 'master' into working, getting external updates
load_db and gem_loading for optional extra parameters
updated components to be unique on name AND type, only really required changed to get_or_create