Also reworked all the dockerfiles to be cleaner and consistent: * Fixed some indentation * Removed vim dependencies * Collapsed RUN steps for less build layers * Renamed dockerfiles/ to shorter and more adaptable docker/