Everything else

TODO: throw the library in there somewhere
TODO: Fix up research
TODO: add maint
Merge remote-tracking branch 'origin/master'

Conflicts:
	centralstation.dmm