Resolved merge conflicts

Merge branch 'master' of https://github.com/skembel/picante

Conflicts:
	DESCRIPTION
	R/pglmm.R
	man/pglmm.Rd
	man/picante-package.Rd

DESCRIPTION

@@ -6,6 +6,6 @@ Date: 2014-03-05
 Author: Steven W. Kembel <[email protected]>, David D. Ackerly <[email protected]>, Simon P. Blomberg <[email protected]>, Will K. Cornwell <[email protected]>, Peter D. Cowan <[email protected]>, Matthew R. Helmus <[email protected]>, Helene Morlon <[email protected]>, Campbell O. Webb <[email protected]>
 Maintainer: Steven W. Kembel <[email protected]>
 Depends: ape, vegan, nlme
-Suggests: brglm, circular, corpcor, quantreg, plotrix
+Suggests: brglm, circular, corpcor, quantreg
 Description: Phylocom integration, community analyses, null-models, traits and evolution in R
 License: GPL-2

README.md

@@ -3,4 +3,26 @@ picante
 
 R tools for integrating phylogenies and ecology
 
-Development of the picante R package is being migrated to Github from R-Forge. Updates to follow shortly.
+http://picante.r-forge.r-project.org/
+
+About
+-----
+
+The Picante package provides tools for Phylocom integration, community analyses, null-models, traits and evolution in R.
+
+The package includes functions for analyzing the phylogenetic and trait diversity of ecological communities, comparative analyses, and the display and manipulation of phenotypic and phylogenetic data.
+
+Package maintainer: Steven Kembel
+
+Developers: Peter Cowan, Matthew Helmus, Steven Kembel
+
+Contributors: David Ackerly, Simon Blomberg, Will Cornwell, Peter Cowan, Matthew Helmus, Steven Kembel, Helene Morlon, Cam Webb
+
+Development of picante has been supported by NSERC, NESCent, the Google Summer of Code, and the Gordon and Betty Moore Foundation.
+
+Thanks to Jonathan Davies, Kyle Dexter, Catherine Graham, Nathaniel Hallinan, Nick Matzke, Alain Paquette, Emmanuel Paradis, Juan Parra, Dan Rabosky, and Marten Winter for feedback and bug reports. Thanks to R-Forge for hosting the project.
+
+News
+----
+
+From version 1.6 onwards, development of picante will primarily happen on Github