Merge pull request #1 from ceph/master

Rebase from upstream
monitor_interface template change

This will fix the monitor_interface issue for Vagrant provisioning
while being preferred to using group_var entries for physical
deployments.
Merge pull request #141 from matthewrees/monitor-interface

monitor_interface template change