Added Support for Admin Machine Endpoint

I needed this for my project and added it in a similar way to the
Statistics endpoint.
adding error handling to stats
Merge branch 'machine-endpoint' of git://github.com/james-andrewsmith/etcetera into james-andrewsmith-machine-endpoint
adding test to machine module
fixing test
Merge pull request #1 from drusellers/master

Updating from Upstream