wip
update uilabels
work on some subclasses & keypad
pod update;
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
Merge pull request #88 from 1aurabrown/laura

@ashfurrow => First eidolon pr - UI work