Merge pull request #502 from goldenrod/add-goldenrod

Merging PR from @goldenrod
rebuilt with @goldenrod added!
Added @goldenrod
Merge pull request #501 from eviljlord/add-eviljlord

Merging PR from @eviljlord
rebuilt with @eviljlord added!
Added @eviljlord
TEST add-eviljlord
TEST add-goldenrod
Merge pull request #504 from eviljlord/add-eviljlord

Merging PR from @eviljlord
rebuilt with @eviljlord added!
Added @eviljlord
Merge pull request #505 from goldenrod/add-goldenrod

Merging PR from @goldenrod
rebuilt with @goldenrod added!
Added @goldenrod
TEST add-eviljlord
Merge pull request #508 from eviljlord/add-eviljlord

Merging PR from @eviljlord
rebuilt with @eviljlord added!
Added @eviljlord
TEST add-jllord
TEST add-eviljlord