Merge pull request #1029 from brooksryba/develop

Develop
Removing imgfile and thumbnail_file from the front end Frame model.
Edited travis settings, and fade in the ImageCanvas image as well as the zoomify widget image
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop