update startup instructions
Merge branch 'master' of http://nb.znovate.com/git/nb
more openid work work for embedded NB
forgot a few files
update contact info
update pdf error message
Merge branch 'html'
Merge branch 'master' of github.com:nbproject/nbproject

Conflicts:
	README
tmp fix for not spamming NB admin w/ error msgs
Merge branch 'master' of https://github.com/nbproject/nbproject

Conflicts:
	templates/web/base.html