Merge pull request #55 from Trott/ilios-tests

Cucumber tests
Merge branch 'master' into ilios-tests