Clean up branch determination
Merge branch 'master' of https://github.com/buunguyen/octotree

Conflicts:
	src/inject.js