deployment
Merge pull request #86 from orta/more_state

@1aurabrown => deployment setup
fix rebase + tests
Merge branch 'master' of https://github.com/artsy/Eidolon into fix_tests
Merge pull request #1 from orta/fix_tests

@1aurabrown => fix rebase + tests