Small changes
Merge branch 'master' of github.com:drugis/drugis.org
Update stories
Merge branch 'master' of github.com:DanielReid/drugis.org
Minor changes also