Squashed commit of the following:

commit 00f2ac7717f0c5c38ad9eb56b6f9dbca4af7d4cd
Merge: 07475e7 646f337
Author: Dylan Page <genpage@pagefortress.com>
Date:   Wed Sep 24 16:10:33 2014 -0400

    Merge pull request #86 from MagisterXero/master

    F*k you git. Duping my commits.

commit 646f337236e93cd261a8ff0a5b88684ae981f1f8
Author: MagisterXero <MagisterXero@hotmail.com>
Date:   Wed Sep 24 13:40:35 2014 -0500

    Archiving Cleanup Phase 2!

    Removed mod files without minecraft versioning in file name.

commit 07475e7a32c1c608d0c76057db52fd911355721a
Merge: d3c6aa6 28fb205
Author: Dylan Page <genpage@pagefortress.com>
Date:   Wed Sep 24 12:44:48 2014 -0400

    Merge pull request #84 from MagisterXero/master

    Repo Archiving: Phase 1

commit 28fb2053ef7681f7ad17736cacc3c2c974ea0805
Author: MagisterXero <MagisterXero@hotmail.com>
Date:   Wed Sep 24 11:35:01 2014 -0500

    Repo Archiving: Phase 1
    Renaming currently used files for 1.7.10

commit d3c6aa6301166925eaa5c3c467d51e4973379137
Merge: 9d54777 4f374a4
Author: JackAttack <jackattackpokemane@gmail.com>
Date:   Mon Sep 22 19:53:19 2014 -0400

    Merge pull request #83 from MagisterXero/master

    Fix't

commit 4f374a422bec2582e2f50e38718a5792dab58947
Author: MagisterXero <MagisterXero@hotmail.com>
Date:   Mon Sep 22 18:49:04 2014 -0700

    Fix't

commit da1f6123c66d39f2016de7641305a6bf714a78d1
Merge: ae995e3 9d54777
Author: MagisterXero <MagisterXero@hotmail.com>
Date:   Mon Sep 22 18:47:26 2014 -0700

    Merge remote-tracking branch 'upstream/master'

commit ae995e32134f012ec0fe0c29ddcd48042712caac
Author: MagisterXero <MagisterXero@hotmail.com>
Date:   Mon Sep 22 18:46:41 2014 -0700

    Revert "Fix't"

    This reverts commit bcec81f3bc43e7897473cd5822fa72988086af78.

commit bcec81f3bc43e7897473cd5822fa72988086af78
Author: MagisterXero <MagisterXero@hotmail.com>
Date:   Mon Sep 22 18:46:29 2014 -0700

    Fix't

commit 9d54777401fecfce4377f0699abae9cd176068d1
Merge: b539fd1 1c90a03
Author: JackAttack <jackattackpokemane@gmail.com>
Date:   Mon Sep 22 19:25:56 2014 -0400

    Merge pull request #82 from MagisterXero/master

    Update Mods / Change log

commit 1c90a03367598beb735a70f05ef08ff9632e4d57
Author: MagisterXero <MagisterXero@hotmail.com>
Date:   Mon Sep 22 15:41:27 2014 -0500

    Railcraft
    Screw you CJ, updating after I get an update this morning.

commit 17f09725b65bdc479684d0a521838e34e7a0c19c
Author: MagisterXero <MagisterXero@hotmail.com>
Date:   Mon Sep 22 10:19:28 2014 -0500

    For JZ

commit 0c7b407fa2dc9af4fbe8094b688e3555581e0c78
Author: MagisterXero <MagisterXero@hotmail.com>
Date:   Mon Sep 22 09:33:10 2014 -0500

    Update Mods / Change log
    Standard update for bug fixes
    TCon has been reworked, may need to rebuild smelteries.

commit b539fd1aa38301d96ff9be9dbdba7ac06d05cd46
Merge: 9e274e6 8585ca8
Author: Dylan Page <genpage@pagefortress.com>
Date:   Sun Sep 21 19:36:29 2014 -0400

    Merge pull request #81 from TechCavern/master

    Emergency Patch

commit 9e274e6d7373797aa4ab9eefe3a7d238d28c43de
Merge: 8b4b8a2 9b5a2af
Author: Dylan Page <genpage@pagefortress.com>
Date:   Sat Sep 20 03:09:00 2014 -0400

    Merge pull request #80 from TechCavern/master

    Update AE2 to fix crafting (beta 37)

commit 9b5a2af88da3c472b9382c4b6c95a3b7991e0577
Author: John <janandjohn3@gmail.com>
Date:   Fri Sep 19 22:20:52 2014 -0500

    Update AE2 to fix crafting (beta 37)

commit 8b4b8a268dfdc33d3423059191e883ed22c2368f
Merge: d4cd97d 98dbf0d
Author: JackAttack <jackattackpokemane@gmail.com>
Date:   Fri Sep 19 13:23:07 2014 -0400

    Merge pull request #79 from TechCavern/master

    Thanks Sparxy! I thought I was done... :(

commit d4cd97d84349b9318d0fb44fab4bb6ab607e5d63
Merge: 28d8182 951f650
Author: Dylan Page <genpage@pagefortress.com>
Date:   Fri Sep 19 10:04:08 2014 -0400

    Merge pull request #78 from TechCavern/master

    Update 0.4.8f