ok I think I have it this time.
it's lots of fun doing this on my phone.
Remove bro-ids.
Merge remote-tracking branch 'upstream/master' into no-bro
Merge remote-tracking branch 'origin/master'
Merge branch 'no-bro'
Add an openntpd rule
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/ddpbsd/ossec-hids
Merge pull request #144 from ddpbsd/master

Continue removing the bro-ids stuff