Merge branch 'release/0.12.5' into develop
tests do now pass for both python 2.7 and python 3.4
test suite passed with 99% coverage for python 3.4
updated docs
bumbed version number
Merge branch 'release/0.13'