Dfoxpowell/working login modals

Branched from clean master.  Modals now working, some sort of bug in the previous modals branch