update docs
Merge branch 'diffbot-testing'
turn off hearbeats when compiling openssl libs
to fix heartbleed bug.
Merge branch 'master' into diffbot-matt
Merge branch 'master' into diffbot-matt