Merge branch 'master' of github.com:jrconlin/wmf into dev

Conflicts:
	.gitignore
nightly checkin
nightly checkin
nightly checkin

- displaying user page (argh, go templates...)
Merge branch 'dev' of github.com:jrconlin/wmf into dev