Merge tag '0.3.6' into cdb

Release 0.3.6
added CDB_Math_mode
Merge pull request #52 from CartoDB/CDB-3483

Adds CDB_Math_Model