initial checkin
Merge remote-tracking branch 'origin/master' into external-data
make tags and shortcuts configurable
Merge pull request #19 from redmunds/external-data

Make tags and shortcuts configurable