Merge branch 'master' into tracer

# Conflicts:
#	CHANGELOG.md
#	lib/parser.js

Author: nwronski

CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 - Added missing binary division operator so that things like this will now correctly parse.
 
+  ``` sql
+  select CAST(4 / 9 AS DECIMAL(5,2)) as hat
+  from pants;
+  ```
+- Fixed `BETWEEN` expression grammar to remove bad recursion.
+
+  ``` sql
+  select num
+  from nums n
+  where num between 100 AND 200;
+  ```
+- Fixed `ORDER BY` grammar to allow more than two ordering expressions.
+
+  ``` sql
+  select color, size, shape, name
+  from eggs
+  order by color asc, size desc, shape asc
+  ```
+
 ## [v0.11.2] - 2016-01-29
 ### Fixed
 - Refactor to solve the different issues that come from trying to use unquoted reserved words as