norm2 atom. changed conicconstr to now have an array of conicobj.
Merge branch 'refactor' of https://github.com/cvxgrp/CVX.jl into refactor

Conflicts:
	refactored/constraints.jl
	refactored/variable.jl