Misc

Pr's:
https://github.com/inliniac/suricata/pull/1204
https://github.com/inliniac/suricata/pull/1207
https://github.com/inliniac/suricata/pull/1208
https://github.com/inliniac/suricata/pull/1212
https://github.com/inliniac/suricata/pull/1213
https://github.com/inliniac/suricata/pull/1201

Prscript:
- PR build: https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/63
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/63