changes to dev docs
a note about using reference citations
merging conflicts
Merge pull request #427 from pastephens/master

devel docs