ignore ~ tmp files;
Merge branch 'master' of https://github.com/Nehmulos/media-u

Conflicts:
	.gitignore
parse episode numbers, fix name parse bugs, optional season parsing;