update startup instructions
Merge branch 'master' of http://nb.znovate.com/git/nb
Merge branch 'master' of github.com:nbproject/nbproject

Conflicts:
	README
tmp fix for not spamming NB admin w/ error msgs