Add test for findAndCountAll with required belongsTo and limit

Test currently fails. See issue #1953.
restore breaking test
added pretty complicated case, that fails at the moment
fixed pretty complicated test
small fix, and prittified indentation a bit
Merge branch 'master' into associating-sections-when-deletions

* master:
  Allow removing has-many associations by id
  Update README.md
  #2338 - Associations remove[AS][plural]
  Use the new beta build env on Travis
  Text fix
  More promises
  Promisify tests
  Remove unnecssarily asynchronous tests
  Update changelog with BC breaking hstore change
  Update json test expectation
  Merge fix
  Update pg-hstore
  Removed no longer supported nested hstore objects from tests. Improved hstore array handling.
  Use pg-hstore for hstore parsing
  Hstore empty string tests
fixed indentations
[ci skip] Change bulk update and destroy to use where argument
Fixed a bug where plain objects in combination with sequelize.where were not converted properly to SQL. Closes #2077
Change the default when searching postgres arrays from && to =
Allow logging in individual functions even though the global logging option is false. Closes #2571
Hopefully this upsert code works
More work on upsert
Fix that annoying bug introduced by upsert + add changelog entry
Found a few more places where timestamp code could be simplyfied
Move the formatResults func to mysql query
Refactored the upsert query for postgres to be atomic
Change syntax in LIKE example
Merge pull request #2518 from janmeier/upsert

Upsert
fix replication always use write host