Added Functor instance, cleaned up blanks in *.cabal.