cleanup
Merge branch 'trusty' of github.com:makinacorpus/osm-mirror into trusty

Conflicts:
	install.sh