Merge branch 'master' into milestones/2.0.0

changelog.md

@@ -6,6 +6,7 @@ Notice: All 1.7.x changes are present in 2.0.x aswell
 - improves handling of uncaught errors in eventemitter [#1245](https://github.com/sequelize/sequelize/pull/1245)
 - fixes bug with mysql replication and pool settings [#1251](https://github.com/sequelize/sequelize/pull/1251)
 - through models created by N:M associations no longer inherit hooks [#1263](https://github.com/sequelize/sequelize/issues/1263)
+- .col()/.literal()/etc now works with findAll [#1249](https://github.com/sequelize/sequelize/issues/1249)
 
 # v2.0.0 (alpha1) #
 - [FEATURE] async validations. [#580](https://github.com/sequelize/sequelize/pull/580). thanks to Interlock

test/dao-factory/findAll.test.js

@@ -858,7 +858,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         })
       })
 
-      it.only('should be possible to order by sequelize.col()', function (done) {
+      it('should be possible to order by sequelize.col()', function (done) {
         var self = this
         var Company = this.sequelize.define('Company', {
           name: Sequelize.STRING