doxygen tags updated
Merge branches 'docs' and 'master'
Merge branch 'master' of https://github.com/molpopgen/fwdpp