Add NTP servers
Merge remote-tracking branch 'upstream/master'

Conflicts:
	hieradata/common.yaml

Merge conflicts
Merge pull request #4 from erlendbm/master

Add NTP servers