Small tweaks.
Merge branch 'master' of https://github.com/nrootn/traxis

Conflicts:
	src/mainGUI.py

Merging conflicts and AutoPEP8.