Merge pull request #258 from ceph/wip-fix-format-samba

Fixed formatting and added a better variable for time out
Conflicts:

	teuthology/task/samba.py