Add more endpoints, fixes #517
Merge pull request #519 from metamx/more-endpoints

Add more endpoints, fixes #517