Merge branch 'hotfix/0.2.5'
Slight refactor to accomodate Nose's test discovery.
Merge pull request #41 from lyndsysimon/feature/nose_compatibility

Slight refactor to accomodate Nose's test discovery.
Merge branch 'master' into develop
fix failing tests: remove _test_methods in tests; mark updated objects as dirty