update vundle
add local spree overrides
add a whereami alias to show details of current head
default to upstream for merge
better javascript and a jsx plugin