Change path in travis
Merge branch 'dev/climate'

Conflicts:
	src/main.c
Added the ability to read grid state from a file; added some basic parsing of command line arguments
Merge branch 'master' into dev/climate

Conflicts:
	CMakeLists.txt