Update to 0.9.5

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Merge branch 'master' of git://github.com/xapi-project/ffs
Update to 0.9.6

Signed-off-by: David Scott <dave.scott@eu.citrix.com>