Cleaned up codebase.
Merge branch 'next' of github.com:spencerwi/imgsort into next

Conflicts:
	bin/imgsort
	imgsort.gemspec