Merge pull request #2 from chrisdotcode/master

Lots of changes to be merged
Merge pull request #3 from chrisdotcode/state

More merges from state branch.
Update for ghc 7.8
Merge git://github.com/zerglingrush/aclick