Changes for edoc to work properly
Visual cleanup
Update tools.mk to 0.5.7
Merge pull request #421 from basho/jrd/feature/edoc-fixes

Edoc cleanup

Reviewed-by: reiddraper
Add doc directory to .gitignore

This directory is generated by `make docs`
Merge pull request #422 from basho/feature/add-doc-dir-to-gitignore

Add doc directory to .gitignore

Reviewed-by: reiddraper
Merge branch '2.0' into develop
prevent race condition on basho_bench run in yokozuna_essential by increasing maximum number of rejections
Merge pull request #425 from basho/zl-fix-essential-test-handoff

prevent race condition on basho_bench run in yokozuna_essential by incre...

Reviewed-by: coderoshi
merge develop into 2.0
Merge pull request #430 from basho/zl-merged-develop-into-2.0

merged develop into 2.0

Reviewed-by: seancribbs