Better format for api.
Merge branch 'master' of github.com:g0v/api.ly

Conflicts:
	apiary.apib