Remove commented out can failover, fix trailing spaces
Fix init script to use su instead of sudo

Fixes brianbianco#137.
Merge pull request #141 from martinb3/fix_sudo_su

Fix init script to use su instead of sudo
Merge pull request #139 from martinb3/cleanup_sentinel_template

Remove commented out can-failover, fix trailing spaces
Merge remote-tracking branch 'upstream/2.0.0_wip' into 2.0.0_wip