clarify server methods, for hapijs/hapi#1922
Merge branch 'beta' of github.com:hapijs/hapijs.com into beta