Fix mutually exclusive sorting and make it optional
Merge branch 'master' of github.com:jheatmap/jheatmap