Fixing file merge conflicts.
Merge remote-tracking branch 'upstream/master'
Makefile now creates directories needed for capabilities.py
Changes to tests, removing coverage on one line in compute/numpy.py
Cleaned up test_compute_up_projection and field.
Reverted to old sort function, removed test.
Merge pull request #739 from brittainhard/capabilities_makefile

Docs Makefile additions, compute/numpy tests.