Merge branch 'master' into justin/erbium

diff --combined scripts/shaderlist.txt
index 5474ff34df4c7e4f537006d5884dcefc5bfa3e5e,61e602a50b57fde02dcc38368f2f40ef6c2a10fc..5efb2a0551503cc5b4ef7d62321a2c6a58a80af5
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -19,10 -19,10 +19,11 @@@ liquids_slim
  liquids_water
  logos
  map_atelier
+ map_boil
  map_catharsis
  map_courtfun
  map_darkzone
 +map_erbium
  map_g-23
  map_glowplant
  map_implosion