Merge pull request #37 from csugrue/master

formatting updates
fixing admin lost page
fixing botched merge