Updating findOrCreate use with defaults option.
Merge branch 'jakeorr-master'
Bump version
Merge remote-tracking branch 'upstream/master'