Gemfile, Guard, gitignore
Merge branch 'master' into conversion

Conflicts:
	Guardfile
rb-fsevent on darwin
Add timecop to dev deps
Return nil on invalid date
Fix flaky time spec