Squashed commit of the following (but without header changes):

commit a818a998197bde7d828db1b80a93801f970265d2
Author: zjr <me@zjr.io>
Date:   Thu Feb 7 14:41:49 2013 -0500

    Added contact form
Renamed that weird city/county file and updated path in modalContact