Merge branch 'patch-4' of https://github.com/asreimer/davitpy-usask into development

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
fixed some syntax warnings, typo in documentation
Merge branch 'patch-5' of https://github.com/asreimer/davitpy-usask into development

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' into development