point setup doc to 2-2-stable branch
fixs for 2-2-stable

update the instructions to pull 2-2-stable and to also create the tmp/sockets folder thats required for puma to start
Merge remote-tracking branch 'paulbad/patch-1' into patch-1

Conflicts:
	doc/installation.md