Squashed commit of the following:

commit b98d6f792c0128ebca19b9433a7ea8149fac1e89
Author: bitpshr <paulbouchon90@gmail.com>
Date:   Fri Apr 26 18:05:47 2013 -0400

    Example configuration file
Merge branch 'master' into geezer
[ci skip]