Pushing all current changes of rogueElement
Merge branch 'rogueElement' of github.com:frostredoubt/ExoPlanets into rogueElement