increased timeouts, disabled settings that don't work with Nikon
catch AssertionErrors in async tests
adjust test timeouts
set test reporter to 'list' again
Merge pull request #37 from michaelkoetter/wip/test-failures

Improved unit tests
Merge pull request #2 from lwille/master

sync master