makefiles and shortcuts fixed
Merge branch 'master' of https://github.com/CellProfiler/CellProfiler

Because git told me to?