Bump Cabal version to v1.20.0.4

Cabal/Cabal.cabal

 name: Cabal
-version: 1.20.0.3
+version: 1.20.0.4
 copyright: 2003-2006, Isaac Jones
            2005-2011, Duncan Coutts
 license: BSD3

Cabal/Makefile

 
-VERSION=1.20.0.3
+VERSION=1.20.0.4
 
 #KIND=devel
 KIND=rc

Cabal/changelog

 -*-change-log-*-
 
+1.20.0.4 Ryan Thomas <ryan@ryant.org> January 2016
+	* Cabal.cabal: change build-type to Simple.
+
 1.20.0.1 Johan Tibell <johan.tibell@gmail.com> May 2014
 	* Fix streaming test output.