Adding ntp stuff
Fixing quotes
Merge branch 'ntp' into production