went nazi with tabs....
Merge commit
Another tabs/space nazi commit
Mergefixes
First iteration of hazard detection unit. Still lacking some logic (mainly flush logic). Stall should be functioning, not syntax checked or anything.
Merge branch 'master' into haz_unit