Adding more specificity to tests
resolving merge conflicts
Adding changes for new equals implementation
Merge pull request #16 from ankenmanp/equalsExperiment

Adding Eric's equals method and some test and build improvements