Pull request for: Separating common configuration options to a git tracked file