Merge branch 'master' into feature/vimeo

# Conflicts:
#	README.md

README.md

@@ -2,10 +2,13 @@
 
 A collective list of JSON APIs for use in web development.
 
+> While I appreciate the masses of pull requests and community involement, some PRs have been specifically to market company APIs that offer paid for solutions. This API list is not a marketing tool, but a tool to help the community build applications and use free public APIs quickly and easily. Pull requests that explicitly are marketing attempts won't be accepted, thanks for understanding! :)
+
 ### Animals
 | API | Description | OAuth |Link |
 |---|---|---|---|
 | Petfinder | Adoption | No | [Go!](https://www.petfinder.com/developers/api-docs/) |
+| RescueGroups | Adoption | No | [Go!](https://userguide.rescuegroups.org/display/APIDG/API+Developers+Guide+Home) |
 
 ### Anime
 
@@ -20,6 +23,7 @@ A collective list of JSON APIs for use in web development.
 |---|---|---|---|
 | Church Calendar API | Catholic liturgical calendar | No | [Go!](http://calapi.inadiutorium.cz/) |
 | Non-working days API | Database of ICS files for non working days | No | [Go!](https://github.com/gadael/icsdb) |
+| Date and Time | Global Date and Time | No | [Go!](http://www.timeanddate.com/services/api/) |
 
 ### Development
 
@@ -30,6 +34,7 @@ A collective list of JSON APIs for use in web development.
 | UI Names | Generate random fake names | No | [Go!](https://github.com/thm/uinames) |
 | Adorable Avatars | Generate random cartoon avatars | No | [Go!](http://avatars.adorable.io) |
 | Github - User Data | Pull public information for a user's github | No | [Go!](https://api.github.com/users/hackeryou) |
+| Gitter | Chat for GitHub | Yes | [Go!](https://developer.gitter.im/docs/) |
 | JSONPlaceholder | Fake data for testing and prototyping | No | [Go!](http://jsonplaceholder.typicode.com/) |
 | RoboHash | Generate random robot/alien avatars | No | [Go!](https://robohash.org/) |
 | API Only | Several APIs free. | No | [Go!](http://apionly.com/) |
@@ -41,8 +46,8 @@ A collective list of JSON APIs for use in web development.
 
 | API | Description | OAuth |Link |
 |---|---|---|---|
-| BreweryDB | Beer | No |[Go!](http://www.brewerydb.com/developers) |
-| LCBO API | Alcohol | No |[Go!](https://lcboapi.com/) |
+| BreweryDB | Beer | No, but apiKey query string |[Go!](http://www.brewerydb.com/developers) |
+| LCBO API | Alcohol | No, but apiKey query string |[Go!](https://lcboapi.com/) |
 
 ### Data Access
 
@@ -51,6 +56,9 @@ A collective list of JSON APIs for use in web development.
 | Abbreviation API | Get abbreviations and meanings | No |[Go!](https://market.mashape.com/daxeel/abbreviations) |
 | Callook.info API | United States ham radio callsigns | No |[Go!](https://callook.info) |
 | Celebinfo API | Celebrity information API | No |[Go!](https://market.mashape.com/daxeel/celebinfo/) |
+| Open Government | United State Government Open Data | No |[Go!](https://www.data.gov/) |
+| Yelp | Find Local Business | Yes |[Go!](https://www.yelp.com/developers) |
+| Quandl API | Stock Market Data | No |[Go!](https://www.quandl.com/) |
 
 ### Exchange
 
@@ -69,6 +77,12 @@ A collective list of JSON APIs for use in web development.
 | Comic Vine | Comics | No | [Go!](http://comicvine.gamespot.com/api/documentation) |
 | Steam | Steam Client API | Yes | [Go!] (https://developer.valvesoftware.com/wiki/Steam_Web_API) |
 
+### Geocoding
+
+| API | Description | OAuth |Link |
+|---|---|---|---|
+| OpenCage | Forward and reverse geocoding using open data | No | [Go!](https://geocoder.opencagedata.com) |
+
 ### Media
 
 | API | Description | OAuth |Link |
@@ -90,22 +104,27 @@ A collective list of JSON APIs for use in web development.
 | Imgur | Images | Yes | [Go!](https://api.imgur.com/#overview) |
 | Chuck Norris Database | Jokes | No | [Go!](http://www.icndb.com/api) |
 | Medium | community of readers and writers offering unique perspectives on ideas. | Yes | [Go!](https://github.com/Medium/medium-api-docs)
+| Flickr | Flickr Services | Yes | [Go!](https://www.flickr.com/services/api/)
+| Reddit | Homepage of the internet | Parts | [Go!](https://www.reddit.com/dev/api)
 
 ### Music
 | API | Description | OAuth |Link |
 |---|---|---|---|
 | Discogs | Music | No | [Go!](https://www.discogs.com/developers/) |
 | EchoNest | Music | No | [Go!](http://developer.echonest.com/docs/v4) |
+| Jamendo | Music | Yes | [Go!](https://developer.jamendo.com/v3.0) |
 | LastFm | Music | No | [Go!](http://www.last.fm/api) |
 | Mixcloud | Music | No | [Go!](https://www.mixcloud.com/developers/) |
 | MusicBrainz | Music | No | [Go!](https://musicbrainz.org/doc/Development/XML_Web_Service/Version_2) |
 | Soundcloud | Music | No | [Go!](https://developers.soundcloud.com/) |
 | Spotify | Music | No | [Go!](https://developer.spotify.com/web-api/migration-guide/) |
+| Musixmatch | Music | No, but `apikey` query string | [Go!](https://developer.musixmatch.com/) |
 
 ### Open Source projects
 | API | Description | OAuth |Link |
 |---|---|---|---|
 | Drupal.org | Drupal.org API | No | [Go!](https://www.drupal.org/drupalorg/api) |
+| Libraries.io | Open source software libraries | No | [Go!](https://libraries.io/api) |
 
 ### Security
 
@@ -121,6 +140,7 @@ A collective list of JSON APIs for use in web development.
 | NASA | NASA data, including imagery | No | [Go!](https://api.nasa.gov) |
 | Wunderground | Weather | No | [Go!](http://www.wunderground.com/weather/api/) |
 | OpenWeatherMap | Weather | No | [Go!](http://openweathermap.org/api) |
+| Yahoo! Weather | Weather | No | [Go!](https://developer.yahoo.com/weather/) |
 | World Bank | World Data | No | [Go!](http://data.worldbank.org/developers) |
 | Open Notify | ISS astronauts, current location API | No | [Go!](http://open-notify.org/Open-Notify-API/) |
 | Fedger.io | Query machine intelligence data | No | [Go!](https://dev.fedger.io/docs/) |
@@ -134,6 +154,7 @@ A collective list of JSON APIs for use in web development.
 | LinkedIn REST-API | The foundation of all digital integrations with LinkedIn | Yes | [Go!](https://developer.linkedin.com/docs/rest-api) |
 | Facebook API | Facebook Login, Share on FB, Social Plugins, Analytics and more | Yes | [Go!](https://developers.facebook.com/) |
 | Twitter API | Read and write Twitter data | Yes | [Go!](https://dev.twitter.com/rest/public) |
+| Telegram API | Read and write Telegram data | Yes | [Go!](https://core.telegram.org/api#getting-started) |
 
 ### Sports/Fitness
 
@@ -143,6 +164,7 @@ A collective list of JSON APIs for use in web development.
 | FitBit | FitBit API | No | [Go!](https://dev.fitbit.com) |
 | Stattleship | MLB, NBA, NHL, NFL | No, but a token is required | [Go!](https://www.stattleship.com/#) |
 | JCDecaux Bike API | JCDecaux's self-service bicycles | No, but `apiKey` query string | [Go!](https://developer.jcdecaux.com/) |
+| City Bikes API | City Bikes around the world | No | [Go!](http://api.citybik.es/v2/) |
 
 ### Transportation
 | API | Description | OAuth |Link |
@@ -159,6 +181,7 @@ A collective list of JSON APIs for use in web development.
 | Transport for Paris, France | RATP Open Data API | No | [Go!](http://data.ratp.fr/api/v1/console/datasets/1.0/search/) |
 | Transport for Sao Paulo, Brazil | SPTrans | Yes | [Go!](http://www.sptrans.com.br/desenvolvedores/APIOlhoVivo/Documentacao.aspx) |
 | Transport for The Netherlands | NS | No | [Go!](http://www.ns.nl/reisinformatie/ns-api) |
+| Schiphol Airport API | Schiphol | Yes | [Go!](https://flight-info.3scale.net/)
 
 ### Vehicle
 | API | Description | OAuth |Link |
@@ -169,3 +192,4 @@ A collective list of JSON APIs for use in web development.
 | API | Description | OAuth |Link |
 |---|---|---|---|
 | Vimeo | Vimeo Developer API | Yes | [Go!](https://developer.vimeo.com/)
+| YouTube | Add YouTube functionality to your sites and apps. | Yes / No | [Go!](https://developers.google.com/youtube/)