added mixed norm function
- renamed norm_mixed to mixed_norm
- use wrapper norm function instead of directly calling norm functions
- fixed column bug
- added unit tests
Added the description for convolution
Update index.rst

I reflected the suggested changes. If you think the sign should be changed to "unknown" because that's what the code does now, let me know.
working on consensus admm example
cleaned up admm pool example
added branch and bound example
fixed branch and bound so solutions are not 0
minor clean up of branch and bound
shortened branch and bound
shortened branch and bound
simplifying examples
made formatted constraints cached
confirmed issue with cvxopt inconsistency fixed
Bump version: 0.2.9 → 0.2.10
refactored error definitions
fixed import error
updated dcp section
Merge pull request #119 from ernestryu/patch-1

Added the description for convolution
Merge branch 'master' of https://github.com/gbaier/cvxpy into gbaier-master

* 'master' of https://github.com/gbaier/cvxpy:
  - renamed norm_mixed to mixed_norm - use wrapper norm function instead of directly calling norm functions - fixed column bug - added unit tests
  added mixed norm function