Resolved merge conflicts for all PRs after #8 except #35 up to #43

This is the combination of pull requests #8 through #36.

@lantius @sethwoodworth @kylehill @phyllisstein @bitemyapp @1337807 @anarchodin @Softwave @nothsa @staeiou @SoniEx2 @coding-horror @danudey @oliyoung @benkulbertis @hasteur @synfinatic @kerin @vicgarcia @max @allo- @ntagg @anarchival @davereid @shawnr @aeberbach @brianjgeiger @TrishHenley @jakerobinson @tomahawk28