added 'done' with token support
added test for defaulting to ordered
Merge branch 'master' of git://github.com/Olivine-Labs/busted

Conflicts:
	src/core.lua
fix 2 tests
fixed merge glitch
changed level of errors to make them point to correct location
bugfix: not loading hidden files failed on windows
updated error levels for better output.
bugfixes
Merge pull request #154 from Tieske/master

added tokens for `done` callback