sketch out changes for options page
Merge branch 'master' of https://github.com/UWNetworksLab/uproxy-common

* 'master' of https://github.com/UWNetworksLab/uproxy-common:
  Fixed update script in node-xmpp Adding meta identity provider template (just loopback for now)
add some more dummy contacts to roster