Merge master into nix-packages and fix conflicts

readme.md

@@ -71,6 +71,7 @@ The following are approved and endorsed extensions/utilities to the core Piston
 -   [Pyston](https://github.com/ffaanngg/pyston), a Python wrapper for accessing the Piston API.
 -   [Go-Piston](https://github.com/milindmadhukar/go-piston), a Golang wrapper for accessing the Piston API.
 -   [piston_rs](https://github.com/Jonxslays/piston_rs), a Rust wrapper for accessing the Piston API.
+-   [piston_rspy](https://github.com/Jonxslays/piston_rspy), Python bindings for accessing the Piston API via `piston_rs`.
 
 <br>
 
@@ -327,6 +328,7 @@ Content-Type: application/json
 `dragon`,
 `elixir`,
 `emacs`,
+`emojicode`,
 `erlang`,
 `file`,
 `forte`,
@@ -378,6 +380,7 @@ Content-Type: application/json
 `ruby`,
 `rust`,
 `scala`,
+`smalltalk`,
 `sqlite3`,
 `swift`,
 `typescript`,