Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
missed one
fixing executable bit, omg.
Merge remote-tracking branch 'upstream/master' into upstream
Merge branch 'upstream'
updated static map image, removed address and replaced it with section about press room
adding olark code to most of the pages
olark integration with "Contact us" buttons
Revert "adding olark code to most of the pages"

This reverts commit 5d8bca534f21acdb01be4c63532794cf0e3daaf2.
removed unused pages and removing link to press page from 3/3 triptych
Merge branch 'master' into upstream

Conflicts:
	signup.html
Merge pull request #23 from NodeBB/upstream

Whoops, my bad.