Initial commit
Updating readme
Updating readme
Merge remote-tracking branch 'github/master'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/develop'
Updating readme
Added License info to README.
Merge commit '7ccd684dd7'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Adding travis config
Travis test
PHP 5.3 fix on tests
PHP 5.3 test fix
PHP 5.3 test fixes
Removing php 5.3 from tests
Fixing strict
Merge branch 'master' into develop