fix tests
Merge pull request #9 from blackheaven/master

lint fixes + tests
minor things
Merge branch 'master' of github.com:etnbrd/flx-compiler
fix broken merge
Merge tests
fix test
Merge branch 'master' of https://github.com/etnbrd/flx-compiler

Conflicts:
	test/test.js