selenuim is set up for all feature tests
fixed merge conflicts
trying to get travis to build with selenium
Merge pull request #111 from kmazanec/testing_branch_18

selenuim is set up for all feature tests - looks great!