Added GUID and ISO 8601 Date format to String type.
Merge branch 'develop'
Added string.guid() and string.isoDate to README.md file
Resolving README.md conflict
Updating new tests to match recent cleanup.
Merge pull request #138 from jmlue42/master

Added string.guid() and string.isoDate()
Fixed example in docs for validating boolean.  Was using undefined variable 'any' instead of 'boolean'.

Signed-off-by: Justin Noel <github@calendee.com>
Merge pull request #152 from calendee/fixBooleanDocExample

Fixed example in docs for validating boolean
Merge pull request #151 from wpreul/master

Adding length, min, and max to object
Upping version to 2.1.0
Merge branch 'master' of github.com:spumko/joi

Merging upstream
Update README.md
or() support. Closes #150.
Support differing Any instances