getting things setup
Merge branch 'master' of github.com:jmfolds/open-trails