post install
Merge branch 'master' of github.com:Mashape/publicapis.com

Conflicts:
	package.json
renaming id to slug
removing empty tags
json cleanup