Merge pull request #2 from doadin/jb2.6

update to 2.6 in prep for 3.0
Various Updates
Various Update
Fixes
Fixes
Merge pull request #3 from doadin/jb3.0

Jb3.0