diff --git a/.ghci b/.ghci
new file mode 100644
--- /dev/null
+++ b/.ghci
@@ -0,0 +1,1 @@
+:set -isrc -idist/build/autogen -optP-include -optPdist/build/autogen/cabal_macros.h
diff --git a/.gitignore b/.gitignore
new file mode 100644
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+dist
+docs
+wiki
+TAGS
+tags
+wip
+.DS_Store
+.*.swp
+.*.swo
+*.o
+*.hi
+*~
+*#
diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,1 +1,8 @@
 language: haskell
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org#haskell-lens"
+    skip_join: true
+    template:
+      - "\x0313free\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}"
diff --git a/.vim.custom b/.vim.custom
new file mode 100644
--- /dev/null
+++ b/.vim.custom
@@ -0,0 +1,31 @@
+" Add the following to your .vimrc to automatically load this on startup
+
+" if filereadable(".vim.custom")
+"     so .vim.custom
+" endif
+
+function StripTrailingWhitespace()
+  let myline=line(".")
+  let mycolumn = col(".")
+  silent %s/  *$//
+  call cursor(myline, mycolumn)
+endfunction
+
+" enable syntax highlighting
+syntax on
+
+" search for the tags file anywhere between here and /
+set tags=TAGS;/
+
+" highlight tabs and trailing spaces
+set listchars=tab:‗‗,trail:‗
+set list
+
+" f2 runs hasktags
+map <F2> :exec ":!hasktags -x -c --ignore src"<CR><CR>
+
+" strip trailing whitespace before saving
+" au BufWritePre *.hs,*.markdown silent! cal StripTrailingWhitespace()
+
+" rebuild hasktags after saving
+au BufWritePost *.hs silent! :exec ":!hasktags -x -c --ignore src"
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
new file mode 100644
--- /dev/null
+++ b/CHANGELOG.markdown
@@ -0,0 +1,13 @@
+3.3.1
+-----
+* Refactored build system
+* Removed upper bounds on my own intra-package dependencies
+
+3.3
+---
+* Added `Control.Alternative.Free` and `Control.MonadPlus.Free`
+
+3.2
+---
+* Added `Control.Free.Applicative`
+* Moved `Control.Monad.Free.Church` from `kan-extensions` into this package.
diff --git a/README.markdown b/README.markdown
new file mode 100644
--- /dev/null
+++ b/README.markdown
@@ -0,0 +1,15 @@
+free
+====
+
+[![Build Status](https://secure.travis-ci.org/ekmett/free.png?branch=master)](http://travis-ci.org/ekmett/free)
+
+This package provides a common definitions for working with free monads, free applicatives, and cofree comonads in Haskell.
+
+Contact Information
+-------------------
+
+Contributions and bug reports are welcome!
+
+Please feel free to contact me through github or on the #haskell IRC channel on irc.freenode.net.
+
+-Edward Kmett
diff --git a/free.cabal b/free.cabal
--- a/free.cabal
+++ b/free.cabal
@@ -1,6 +1,6 @@
 name:          free
 category:      Control, Monads
-version:       3.3.0.2
+version:       3.3.1
 license:       BSD3
 cabal-version: >= 1.10
 license-file:  LICENSE
@@ -26,7 +26,13 @@
   from @w@ to @f@.
 
 build-type:    Simple
-extra-source-files: .travis.yml
+extra-source-files:
+  .ghci
+  .gitignore
+  .travis.yml
+  .vim.custom
+  README.markdown
+  CHANGELOG.markdown
 
 source-repository head
   type: git
@@ -35,9 +41,8 @@
 library
   hs-source-dirs: src
 
-  default-language: Haskell2010
-  default-extensions:
-    CPP
+  default-language:   Haskell2010
+  default-extensions: CPP
   other-extensions:
     MultiParamTypeClasses
     FunctionalDependencies
@@ -48,15 +53,15 @@
 
   build-depends:
     base                 >= 4       && < 5,
-    bifunctors           == 3.0.*,
-    distributive         >= 0.2.1   && < 0.4,
+    bifunctors           >= 3,
+    distributive         >= 0.2.1,
     transformers         >= 0.2.0   && < 0.4,
     mtl                  >= 2.0.1.0 && < 2.2,
-    semigroupoids        == 3.0.*,
-    comonad              == 3.0.*,
-    comonad-transformers == 3.0.*,
-    comonads-fd          == 3.0.*,
-    semigroups           >= 0.8.3.1 && < 0.9
+    semigroupoids        >= 3,
+    comonad              >= 3,
+    comonad-transformers >= 3,
+    comonads-fd          >= 3,
+    semigroups           >= 0.8.3.1
 
   if impl(ghc)
     cpp-options: -DGHC_TYPEABLE
@@ -73,4 +78,4 @@
     Control.Comonad.Cofree.Class
     Control.Comonad.Trans.Cofree
 
-  ghc-options:      -Wall
+  ghc-options: -Wall