Updated to latest dev 7.x-2.6+20-dev
Update taxonomy info and demo links