fixed docstrings
updated copywrite
fixed conflict
fixed conflict
Merge pull request #308 from scopatz/doc-fox

pong!