shipments buffed with multiple trucks and less lazy drivers
merged with population
Merge remote-tracking branch 'population/master'

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
	src/main/java/fi/paivola/population/PopulationExtender.java
TestcaseRunner: dump support, amount of runs
Merge remote-tracking branch 'merge/master'
better directory structure for output
extra commas are optional
Merge branch 'master' of https://github.com/paivola/mapserver

Conflicts:
	.gitignore
	src/main/java/fi/paivola/mapserver/App.java
default_testcase is more csv than ever. first line is skipped
Merge branch 'master' of https://github.com/paivola/mapserver
Merge branch 'master' of https://github.com/hegza/mapserver-population
fixed filepath, better timestamp
Creation of mergetestcase in progress
Merge branch 'master' of https://github.com/paivola/mapserver
fixed windows filepath, extra column
Merge branch 'master' of https://github.com/paivola/mapserver
Added a NOLH-generated parameter source-file for datafarming purposes
Merge branch 'master' of https://github.com/kokosp/mapserver

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
Population improvements