First version of ensure_line
(cherry picked from commit b75d6bd)
Fixes
Merge pull request #112 from jbzdak/merge_base_role

Update of base.Role + tests
New version that is somewhat safer

Merge remote-tracking branch 'remotes/upstream/master' into merge_has_line

Conflicts:
	tests/unit/core/test_roles.py
Merge branch 'merge_has_line' into HEAD

Conflicts:
	provy/core/roles.py
..
Ability to upload encrypted passwords to remote servers.
Final version of UserRole
Added user role and ssh role.
Merge branch 'merge_ssh_user' into all_roles

Conflicts:
	provy/more/debian/users/user.py