#94 Added stateReasonMessage to VirtualMachine
Merge pull request #82 from TheWeatherCompany/issue-94

#94 Added stateReasonMessage to VirtualMachine
TheWeatherCompany/grid-api/issues/#722

Return userData value for instances in plaintext
Revert "TheWeatherCompany/grid-api/issues/#722"

This reverts commit 71fb611bf61fd20b87b84d5b842c210865ffceff.
Merge pull request #84 from greese/develop

Merge Dasein upstream.
TheWeatherCompany/grid-api/#722
fix for MachineImageServiceTests.testList and MachineImageServiceTests.testListByAccountId

looks like it was broken after merging
upstream dasein changes merged
Merge branch 'greese-develop' into develop
Merge pull request #148 from TheWeatherCompany/develop

TWC changes
Merge pull request #150 from maksimov/develop

Merge from 2014.03
Merge pull request #151 from maksimov/develop

Fixed the non-auth proxy support