Possible remedy for #1287
Merge pull request #1291 from timlinux/master

Backported fix for #1287 - memchecker not working on osx yosemite
use /usr/local/qgis as default

The rationale is that so twe dont need to update the script on every new qgis release.
If we developers are installing various qgis versions il say:
/usr/local/qgis-2.2
/usr/local/qgis-2.4
/usr/local/qgis-2.6

we can also do a symlink /usr/local/qgis to our latest qgis
ln -s /usr/local/qgis-2.6 /usr/local/qgis
[Data Test] Add new datatest for volcano.
Merge pull request #1310 from ismailsunni/new_bangunan_data

[Data Test] Add new datatest for volcano.
Fixes for travis builds
Merge remote-tracking branch 'origin' into marquee
Merge remote-tracking branch 'origin/develop' into marquee