2.4.0
Merge branch 'master' of github.com:fritzy/Dulcimer

Conflicts:
	package.json
make import tests not order dependent
make both an actual derived prop
2.4.2
Merge pull request #33 from aaronmccall/2.x_import_export_test_fix

2.x import export test fix