Merge branch 'master' into surface

Conflicts:
mpworks/drones/mp_vaspdrone.py