Improvements to make the demo usable without internet connection (eg. ad hoc wifi)

This pull request contains cleaned-up versions of the hacks I used for my FOSDEM demo.