Merge remote-tracking branch 'dev/precise-dev' into quentin

diff --cc debian/changelog
index 710f480,f50a09b..314db6a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,27 +1,40 @@@
- xvm-devconfig (0.93~glasgall2) unstable; urgency=low
++xvm-devconfig (0.97) unstable; urgency=low
 +
 +  * Configure a port for the noVNC server.
 +
 + -- Quentin Smith <quentin@mit.edu>  Fri, 15 Jun 2018 01:11:16 -0400
 +
+ xvm-devconfig (0.96) precise; urgency=medium
+ 
+   * Add bds to xvm-dev as reflected in k5login.
+ 
+  -- Ben Steffen <bds@mit.edu>  Mon, 04 Nov 2019 20:07:02 -0500
+ 
+ xvm-devconfig (0.95) precise; urgency=medium
+ 
+   * MIT DNS server renumbering
+ 
+  -- Mitchell Berger <mitchb@mit.edu>  Thu, 08 Aug 2019 20:43:00 -0400
+ 
+ xvm-devconfig (0.94) precise; urgency=medium
+ 
+   * More dev cluster renumbering
+ 
+  -- Mitchell Berger <mitchb@mit.edu>  Fri, 13 Jul 2019 01:20:00 -0400
+ 
 +xvm-devconfig (0.93~glasgall1) precise; urgency=medium
 +
 +  * Add a second ring to the dev corosync cluster, for testing the newer
 +    corosync with patches to fix two-ring setups.
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Thu, 07 Jun 2018 16:14:03 -0400
 +
+ xvm-devconfig (0.93) precise; urgency=medium
+ 
+   * Renumber dev cluster infrastructure... again
+ 
+  -- Mitchell Berger <mitchb@mit.edu>  Thu, 12 Jul 2019 23:54:00 -0400
+ 
  xvm-devconfig (0.92) precise; urgency=medium
  
    * Renumber dev cluster infrastructure

diff --cc master.yaml
index d270dd2,804e314..385ffc5
--- 1/master.yaml
--- 2/master.yaml
+++ b/master.yaml
@@@ -151,8 -148,7 +151,8 @@@ trac
  
  vnc:
   base_port: 10003
-  proxy_ip: 18.49.0.80
+  proxy_ip: 18.25.128.80
 + novnc_port: 10000
  
  web:
   baseuri: https://xvm-dev.mit.edu/