Merge branch 'master' into feature.rate-limit

Conflicts:
	src/main/scala/smartbot.scala
paramerize rateLimitMax and rateLimitInterval

and start using named parameters