Merge pull request #1 from almende/develop

Sync with upstream
Merge pull request #2 from almende/develop

Merge in upstream changes
Merge pull request #3 from almende/develop

Pull in upstream
Merge branch 'develop' of github.com:Gillingham/vis into develop