Update ubuntu version detection
Merge branch 'master' of https://github.com/socketubs/isit

Conflicts:
	isit.py