Merge branch 'develop' of https://github.com/syllog1sm/redshift

Conflicts:
	redshift/parser.pyx
* More refactoring. Something seems broken
* Resolved merge
* More merge resolution. No more branching...