updated with more categories
Merge branch 'blin' of http://github.com/bylin/nealelab-intern-scripts into blin