Merge pull request #35 from x-team/develop

WP Unit Tests, Travis, and other improvements
Merge branch 'master' into develop