fixed some cucumber tests, will work on rspecs if I have time.
Merge branches 'master' and 'working'