bumped version to 0.2.6
Merge branch 'master' into gh-pages
updated docco