Fixes bug with combining nodes
always py.test when testing jasmine
Merge branch 'master' into gh-pages