Fix up stuff
Merge branch 'master' of github.com:whoshuu/chimerider