Merge branch 'ER116' of https://github.com/marbetschar/Taffy into marbetschar-ER116
reload before every test for good measure
Merge branch '1.3-dev' of github.com:atuttle/Taffy into 1.3-dev