Update README
Merge branch 'master' of github.com:brennon/salty_dog
Update documentation