6.1.1
Merge branch 'master' of https://github.com/artsy/eidolon into master_2
support artsy 2, improve wording on lost PIN
Merge pull request #320 from orta/master_2

@ashfurrow => 6.1.1 + PIN wording