Fix memory stats retrieval for OSX Mavericks
Remove merge artifacts
Merge branch 'osx-mavericks-memory-stats' of github.com:serverdensity/sd-agent into develop