Some updates
Merge branch 'master' of github.com:m2mIO/mqtt-loadtest

Conflicts:
	src/main/resources/application.conf
	src/main/scala/io/m2m/mqtt/Config.scala
	src/main/scala/io/m2m/mqtt/LoadTest.scala