Rename $tsurl to $baseurl
Add .idea dir to .gitignore
Add travis.yml with phplinting
Merge pull request #152 from addshore/gitignoreidea

Add .idea dir to .gitignore
Merge pull request #151 from addshore/travis

Add travis.yml with phplinting
Merge remote-tracking branch 'addshore/tsurl'

hoping, praying, this doesn't break anything @addshore :P
Merge branch 'master' into oauth

Conflicts:
	acc.php
	templates/prefs.tpl