Merge branch 'master' into bugfix/fix-localarray-copy
Remove references to ndistdims and distdims.
Merge pull request #245 from enthought/bugfix/fix-localarray-copy

Fix LocalArray copy, astype, and view
Merge branch 'master' into protocol-example-plots