Merge branch 'master' into devel

Conflicts:
	CHANGES.txt

Added FreeBox support.

setup.py

@@ -7,11 +7,11 @@ kwargs = {'name': 'Glymur',
           'description': 'Tools for accessing JPEG2000 files',
           'long_description': open('README.md').read(),
           'author': 'John Evans',
-          'author_email': 'john.g.evans.ne at gmail dot com',
+          'author_email': 'john.g.evans.ne@gmail.com',
           'url': 'https://github.com/quintusdias/glymur',
           'packages': ['glymur', 'glymur.data', 'glymur.test', 'glymur.lib',
                        'glymur.lib.test'],
-          'package_data': {'glymur': ['data/*.jp2', 'data/*.j2k']},
+          'package_data': {'glymur': ['data/*.jp2', 'data/*.j2k', 'data/*.jpx']},
           'scripts': ['bin/jp2dump'],
           'license': 'MIT',
           'test_suite': 'glymur.test'}