Resolve package name problems
Merge branch 'master' of github.com:jcrawley/Spitfire

Conflicts:
	src/main/java/com/josephcrawley/Spitfire/Compiler.java
	src/main/java/com/josephcrawley/Spitfire/entities/BinaryExpression.java
Resolve conflicts (ugh)
Use proper package in JJ file