minor enhancements...
Merge remote-tracking branch 'origin/master'

Conflicts:
	settings/buildings.txt
minor enhancements...
Merge remote-tracking branch 'origin/master'

Conflicts:
	crawl/dataminer.py
	settings/buildings.txt
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
some toying around...
Merge branch 'bashing_testing' of https://github.com/erstis-go-botting/scaling-ninja

Conflicts:
	crawl/dataminer.py
	settings/buildings.txt
Merge branch 'bash_testing' of https://github.com/erstis-go-botting/scaling-ninja
just commiting to pull
Merge branch 'bash_testing' of https://github.com/erstis-go-botting/scaling-ninja

Conflicts:
	bot/bot.py