Merge pull request #20 from cyclops8456/helium

Bug #261: vyatta-cfg-system: remove quotes from SysContact and SysLocation
Do not delete tunnel if it is in use by NHRP config
Merge remote-tracking branch 'upstream/helium' into helium