Added marginal plotting capability

Sorry, I committed to the wrong branch, was supposed to go straight to master.