ABSOLUTELY NO FUN ALLOWED.
Merge pull request #11 from d3athrow/Bleeding-Edge

Bleeding edge
Update changelog.html
Update changelog.html
No fun.
Merge pull request #12 from d3athrow/Bleeding-Edge

Bleeding edge
Merge pull request #1025 from Heredth/Bleeding-Edge

Buttbot fixes.