During the Christmas holidays (2016) switched to Platform IO. This is an Integrated Development Environment (IDE) for the Arduino and other development boards. It takes some getting used to, but works fine, with more professional possibilities. Among other things: GIT and the possibility to use the mbed framework.
Great job at platformio.org