Merge branch 'config' of git://github.com/ssov/twincal2 into ssov-config

Conflicts:
	spec/parse_spec.rb