Removed conflicting dependencies. This causes a problem with GHC 7.4.1 if not resolved.
Cleaned up Haddocks and function signatures to fix doc errors.
merging