Added minor doco + cleanup
First stage of refactoring
Added ghc options + cleaned up imports
travis fix