bump to gsconfig to 0.6.9
Juggle versions to make everyone happy
Merge pull request #1477 from jean/2.0.x

Juggle versions to make everyone happy
Moved to pinax-boostrap-account 1.0b2

... since 1.0b3 was not available
Wrap long lines, punctuate consistently (full stops)
Tidying docs

Wrap long lines, tweak some markup, add some TODO notes,
got rid of some sphinx warnings.
Merge pull request #1604 from jean/doc-edits

Doc edits
One name is enough

Don't have same-same but different names.
Edit "complete install" doc

Remove deep indentation, improve highlighting, clarify, add some
details (e.g. geonodeAuthProvider config).
Merge pull request #1627 from jean/one-name

One name is enough
Merge pull request #1629 from jean/complete-install-docs-edit

Edit "complete install" doc
Merge branch '2.0.x' of https://github.com/GeoNode/geonode into upstream-2.0

Conflicts:
	README
Merge pull request #47 from loganalysis/upstream-2.0.x

Upstream 2.0.x