documentation
Merge branch 'master' of https://github.com/nate-d-olson/galaxy-hackathon-2014