Merge tag 'v1.2.0'

1.2.0
updateOrCreate assumes numeric primary key(s)

I removed the check to see if a property is an ID field while building the
values clause to allow it to work if primary key(s) are strings.
Merge pull request #25 from sra/master

updateOrCreate assumes numeric primary key(s)
Add support for logical operators (AND/OR)
Fix buildWhere
Merge pull request #27 from strongloop/feature/logical-operator

Feature/logical operator
Bump versions
Merge branch 'release/1.2.1' into production