Refactored Gemfile and added Windows fixes