marginplot does not require confidence intervals now
Merge branch 'master' of https://github.com/zoomby/margins

Conflicts:
	.gitignore
fixing gitignore