things sort of work
Merge branch 'admm-emerson3' of https://github.com/pbailis/spark into admm-emerson3
Merge branch 'admm-emerson3' of https://github.com/pbailis/spark into admm-emerson3
local changes
Merge branch 'admm-emerson2' of https://github.com/pbailis/spark into admm-emerson3