Merge branch 'release/1.2' into develop

* release/1.2:
  bump 1.2
fixes setup.py description
updates documentation
add python 3.4 support
update CHANGELOG
Merge branch 'release/1.3'

* release/1.3:
  update CHANGELOG
  add python 3.4 support
  updates documentation
  fixes setup.py description