revised colony keywords
Merge branch 'master' of https://github.com/jogloran/govhack
fixed

Conflicts:
	app.py
added years, and improved data some more
refactored datasource stuff
added timestamps for trove entries
Merge branch 'master' of https://github.com/jogloran/govhack

Conflicts:
	app.py