Replaced a couple user .erb files with .haml files
Removed users .erb files, added cuke tests for existing user behaviours.