citation updated
Merge branch 'master' of https://github.com/molpopgen/fwdpp into dev