force sort order on intermittently failing location test
move remaining cucumber tests to rspec
Merge branch 'enhancements'