UNION and nested query support
Added tests
Merge branch 'master' of https://github.com/dracony/PHPixie
Merged upstream fixes
Further application of coding guidelines

Done with Netbeans 7.3
Now with Tabs instead of Spaces!