merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less