Merge pull request #4 from hobson/dev

Week 4 Sprint
better formatting of usage text
bash patch for shellshock
Merge branch 'master' of github.com:hobson/pug
regex
Merge branch 'lanehdev'
Update util.py
Update util.py
Docstring
slugify and naming of aggregates for storing
Merge branch 'master' of github.com:hobson/pug
Merge branch 'lanehdev' of github.com:hobson/pug into lanehdev
aggregate_ids and template for plot and table need to be consolidated