Resync with 1.2b3 with the additional pf options.
Resync with 1.2b3 with the additional pf options.

jxmx/pfsense,ptorsten/pfsense,BlackstarGroup/pfsense,brunostein/pfsense,dennypage/pfsense,NewEraCracker/pfsense,brunostein/pfsense,NOYB/pfsense,BlackstarGroup/pfsense,pfsense/pfsense,BlackstarGroup/pfsense,dennypage/pfsense,brunostein/pfsense,NewEraCracker/pfsense,ch1c4um/pfsense,pfsense/pfsense,NewEraCracker/pfsense,phil-davis/pfsense,pfsense/pfsense,ptorsten/pfsense,phil-davis/pfsense,jxmx/pfsense,ch1c4um/pfsense,pfsense/pfsense,NewEraCracker/pfsense,BlackstarGroup/pfsense,phil-davis/pfsense,ch1c4um/pfsense,ptorsten/pfsense,jxmx/pfsense,NOYB/pfsense,phil-davis/pfsense,dennypage/pfsense,dennypage/pfsense,ch1c4um/pfsense,NOYB/pfsense