show travis-ci badge for master branch
merged with dev v0.2.0a3
removed merge debris
fixed HISTORY.rst (rendering problems)
minor corrections
setup for next development stage