Merge branch 'master' into ubuntu

Conflicts:
	roles/samba/tasks/main.yml
use lineinfile directly
install and use powernap

Conflicts:
	Vagrantfile
	bootstrap.yml
update bootstrap.yml
restart/enable sec and smartmontools on ubuntu
fix samba vagrant host config
powernap, monitor disks by-uuid