back to localhost
no logging
Merge branch 'master' of github.com:shyndman/genarthack2012

* 'master' of github.com:shyndman/genarthack2012:
  New index
  Foo
  Touch end

Conflicts:
	client/index.html
Merge branch 'master' of github.com:shyndman/genarthack2012

* 'master' of github.com:shyndman/genarthack2012:
  Not tested -- deal with it
Update urls