windows gemfile and seeds changes
weird merge issues...might need to back this out. only merging changes from mac-top
added admin setup for users