Bug fixes, updated unit tests

Minor bug fixes, including fixing a bug when trying to include only a single contrast curve file in fpp.ini when running calcfpp. Updated unit tests. Also basic Python 3 compatibility (though not tested).