Merge pull request #2 from LordNature/master

shit
Stylistic changes
Merge pull request #3 from ShortCircuittheBrony/bleeding-edge

Stylistic changes
Merge pull request #4 from LordNature/bleeding-edge

Fixes and stylistic things