added portal site templates
Removed cubietruck role

(this works better as a group)
split iptables rules up between portal and wap