ignore pyc and .magellan config
Merge branch 'master' into osm