added angular and underscore
rewrote tripstream in angular/apiary
Merge branch 'master' of github.com:DerZyklop/hitchhikr