Github feature and a couple bug fixes

@zendesk/samson 

Small bug fixes, 52f7db5 is the only interesting one.