Merge branch 'idockerclient-limits-960' into flocker-app-resource-limits-FLOC-961
add memory_limit and cpu_shares to Application repr test
add tests for memory limit and cpu shares to StartApplication tests
add (not yet implemented) functional tests for Deployer to verify an Application is started with memory limit and cpu shares
add memory_limit and cpu_shares attributes to Application model and the relevant arguments in StartApplication's call to DockerClient.add
test implementations for functional Deployer tests on cpu shares and memory limit
lint fixes
Merge branch 'master' into flocker-app-resource-limits-FLOC-961
simplified tests
updated variable names in tests
return deferred from callbacks in functional tests
Merge pull request #963 from ClusterHQ/flocker-app-resource-limits-FLOC-961

Flocker app resource limits floc 961