Merges user-info into signup, cleans up states
Signup works now, no really it does....
Merge pull request #292 from jamesongamble/iconOnlyTabs

Merges user-info into signup, cleans up states