Fix travis some more?
reorder some things
add manual haddock deploy script
Merge branch 'new-languages'
Move Languages to cruncher-types