Adding conditionals to js 'on' functions
Merge branch 'master' of github.com:inboundnow/leads