Merge branch 'tls' of git://github.com/paulrd/slacker into pauld-merge

Conflicts:
	project.clj
	src/slacker/client/common.clj
Merge branch 'stop-server' of git://github.com/paulrd/slacker into 0.10-dev
Merge remote-tracking branch 'upstream/0.10-dev'

Conflicts:
	project.clj
	src/slacker/client/common.clj
grammer fix and removed unnecessary underscore