Refactoring

To test, use images in `/mnt/bin/danstaples-2014-07-17--17.34.24` on the build server.

items to test:
* app advertisement
* olsrd-mdp turned on
* node upgrading