cannot set flags with compiled re, fix a very broken item_pattern string, fix key name
Fix some regular expressions
 - container_pattern wasn't matching because movie_version didn't always have a
space after it
 - remove some non-greedy matching from container_pattern and item_pattern
 - extraneous [] around pattern for other_parts caused pattern to match any
single character (was it supposed to be \[ to match a literal [?)
Merge branch 'master' of https://github.com/bstrdsmkr/1Channel

Conflicts:
	default.py
Fix re.compile issue again after merge.
Merge branch 'master' of git://github.com/ekoyle/1Channel into ekoyle-master

Conflicts:
	default.py