[HOTFIX] Fix #823
Merge pull request #826 from akbargumbira/develop

[HOTFIX] Fix #823 - prevent tests failing for impact function merge when run from top level package in nose.
Merge pull request #827 from timlinux/develop

This PR fixes package generation and publishing to the experimental repo using fabric
Merge pull request #830 from timlinux/develop

[HOTFIX] Improvements to packaging and version referencing of InaSAFE
Fix for #831 Panel Formatting Error
Merge pull request #833 from timlinux/inasafe-831

Fix for #831 Panel Formatting Error
Resolved merge conflicts