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
fix sizing in storyboards
tests