Update readme file names to match "-2" Heroku rev
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
ignore .DS_Store
WIP
builtin WS test