Updated checkout from 201310

Also testing login/logout links