Development

@Greg-Donaldson @b-cumber @crockj72 @hall5714 

Here's a pull request for a code review. Specifically I'm asking for a review on the changes I've made to the ORM and database loader. Upon completion of the review, this does not need to be merged. I should have been on a public branch off development (not just local), for a PR into development, but ah well, it was easier this way since I had to merge some other branches in.

One problem is that there's other code in this branch that hasn't been reviewed yet, but we'll get to it I'm sure (probably after more re-factoring). Further work is going to entail re-factoring all of the actions.

Also note that any code that was using the database loader now needs to call load_database(), not loadDatabase() as per Guido http://www.python.org/dev/peps/pep-0008/#function-names.