Small formatting change to conform to olivine-labs' style guide
Disallow andWillReturn from being called when there is no call
Fail when after/when are used with an incomplete expectation
Fail when shouldBeCalled or shouldBeCalledWith used after a call has been specified
A little bit of cleanup
Support for out of order calls with andAlso
Added flexible ordering requirements
Properly set error level for unexpected calls
Revert "Properly set error level for unexpected calls"

This reverts commit 6b14c5a90d1192abb9e8c0eeb701a796efa7d511.
Added tests (which exposed a bug\!) for mixing ordered and unordered expectations
Added optional/soft expectations
Updated readme to include new features
Updated brief description in readme
Merge branch 'master' of github.com:ryanplusplus/mock.lua

Conflicts:
	mock.lua