Updated sites, removed color from report headers
Fixed edil pagination
mustache templates
config sample merged with upstream
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rent-watcher.py