pcone constraint
Merge branch 'rd-simpler-rotation-approx' of github.com:rdeits/drake into rd-simpler-rotation-approx

Conflicts:
	systems/robotInterfaces/@Biped/footstepUnitCircleMISOCP.m