Merge pull request #15 from johntyree/master

Encoding issue with the fancy '-' chars and a bugfix.
Merge pull request #16 from johntyree/master

Slight restructure and another bugfix.
Merge pull request #17 from johntyree/master

Globals needed with new main()
Merge pull request #18 from johntyree/master

Div-by-zero error when hiding progress bar
Allow displaying progress bar in reverse order
Merge pull request #20 from vjousse/master

Reverse the display order of markers
Add ticking sound support
Merge pull request #21 from vjousse/master

Enable ticking sound
Allow custom break and pomodoro prefixes/suffixes
Merge pull request #22 from vjousse/master

Allow customizing of suffix/prefix strings
So you can put pymodoro wherever you want
Remove unused import
Multiple, softer dings.
Don't bind exception to unused variable.
Merge remote-tracking branch 'upstream/master' into colored_output

Conflicts:
	pymodoro.py