Merge pull request #1 from ese/master

Merge in new features: categories
added --config-file option
mark where to check config options
clear conflicts in ese-master
clean comments
add config load and save with some more params
added --log-file
Merge branch 'master' of https://github.com/ese/movistartv2xmltv into ese-master
Merge branch 'ese-master'
Fix some config issues, add demarcation, tvpackages, mcast_start_port and mcast_port to config file
Only log errors to console by default
Merge branch 'master' of https://github.com/jmoriano/movistartv2xmltv