Fixed a bug with the get_specific API request
Merge branch 'master' of github.com:benargo/atwd
Tidying up master
Merge branch 'cleanup' of github.com:benargo/atwd into cleanup

Conflicts:
	.htaccess
	test/index.php