Merge branch 'shane-picketlink' into picketlink
Inclusion of basic authentication pages
Inclusion of authenticator
more hacks to get security working