Merge https://github.com/jonathanstowe/Airtime

Conflicts:
	install_minimal/include/airtime-install.php
	python_apps/python-virtualenv/virtualenv-install.sh
Merge branch 'master' of https://github.com/jonathanstowe/Airtime