Merge branch 'master' of https://github.com/dyerlab/popgraph

Conflicts:
	.Rbuildignore
Merge branch 'master' of https://github.com/dyerlab/popgraph