Fixed indentation - use only spaces.
Display usage message with -h and --help.
Merge branch 'master' into omodoro-python2

Conflicts:
	omodoro