Merge pull request #1 from LordNature/master

v1.5 Update
Modify config structure

Untested as of yet
Remove extraneous files
Merge pull request #1 from ShortCircuittheBrony/bleeding-edge

Bleeding edge build merge
Merge pull request #2 from LordNature/master

shit