prep for optimization branch
1) cleaned up optimization script
2) modefied model for script
3) added final energy storage constraint