Pure develop

Bringing everything from 'develop' and 'feature/all' together into one big pile of awesomeness.