Tests for parser.globify and parser._collect_keyvals_from_parsedef
parser.globify() and a helper function _collect_keyvals_from_parsedef
Merge branch 'master' of https://github.com/pnuu/trollsift

Conflicts:
	tests/unittests/test_parser.py
	trollsift/parser.py