New stuff
Merge branch 'master' of github.com:acranox/lsf_analysis

Conflicts:
	runtime.py