* Restored grammar back to POS 3-gram, and fixed what may be errors in the non-reattach oracle.
* Updated fabfile
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop

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