Add url function for macros and update description
change macro list description
Merge branch 'master' of https://github.com/HarrisYip/hubot

Conflicts:
	scripts/macro.coffee