201312 week3

Just to merge changes. Most use cases are done. Just so that Will can merge in the "Forgotten Password" stuff to the main master.