Nothing
The Great Merger
1) Merging two branches manually
2) Moving some functionality to utilities.py (cf. above)
3) Solving corner-cases in timeUntil()
Added plot point styles from other branch