Merge branch 'joeyconfig'

Conflicts:
	config.hs

config-joey.hs

@@ -1,7 +1,5 @@
 -- |  This is the live config file used by propellor's author.
 
-module Propellor.Config.Joey where
-
 import Propellor
 import Propellor.CmdLine
 import qualified Propellor.Property.File as File

config-simple.hs

@@ -1,8 +1,6 @@
 -- | This is the main configuration file for Propellor, and is used to build
 -- the propellor program.
 
-module Propellor.Config.Simple where
-
 import Propellor
 import Propellor.CmdLine
 import qualified Propellor.Property.File as File

config.hs

@@ -1 +1 @@
-Propellor/Config/Simple.hs
+config-simple.hs

propellor.cabal

@@ -15,6 +15,8 @@ Extra-Source-Files:
   TODO
   CHANGELOG
   Makefile
+  config-simple.hs
+  config-joey.hs
   debian/changelog
   debian/README.Debian
   debian/propellor.1