Merge pull request #13 from MartyBurns/master

Test updates and sample data mods