Fixed two bugs:

  - missing global name(_callable got deleted in the loop) bug in modules/useradd.py
  - no 'mako' attribute from salt.utils.templates.
Merge branch 'develop' of github.com:kjkuan/salt into develop