redoing travis matrix
Merge branch 'master' of github.com:cvxgrp/cvxpy

* 'master' of github.com:cvxgrp/cvxpy:
  other int division