updated to be in sync w/ master
Merge branch 'docs' of https://github.com/jschell/JabbR into docs