Squashed commit of the following:

Squashed commit of the following:

commit d5174d9a44cf5065dab6f89203c79d8deb5cdcfd
Author: Adam <redacted>
Date:   Fri Sep 26 02:33:43 2014 -0400

    whitespace cleanup, merge prep

commit 01dbda5b5690b625f8552512f9d1640da49f09a3
Author: Adam <redacted>
Date:   Fri Sep 26 01:49:25 2014 -0400

    pass 3

commit c70eb855e51c9cde2af3476261f19cb06196cbc7
Author: Adam <redacted>
Date:   Fri Sep 26 01:26:37 2014 -0400

    pass 2

commit 3bbd0be81952fd3f1c17a6d9f8b4492026a4b6e6
Author: Adam <redacted>
Date:   Thu Sep 25 22:50:05 2014 -0400

    pass #1

commit d9679c9100bee797d5ef59557b5db67e5b0da9d5
Author: Adam <redacted>
Date:   Thu Sep 25 04:52:28 2014 -0400

    restore ident and gecos

commit e6dad01aafd4ea4de586601574cbe3ce50930567
Author: Kristina Brooks <redacted>
Date:   Tue Sep 23 04:28:38 2014 +0100

    Make it better

commit e82806b53766caf17faaebe3f7e8f66b40ca7180
Author: Kristina Brooks <redacted>
Date:   Tue Sep 23 03:52:41 2014 +0100

    Initial commit for trapbot stuff