Merge pull request #10 from blackheaven/master

Merge tests
Merge pull request #11 from blackheaven/master

Fix lint
minor fixes
Merge branch 'master' of github.com:etnbrd/flx-compiler
use of escope
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/pruner/index.js
	src/pruner/iterators/main.js