Added config.py to heroku branch.
Added config.py to heroku branch.
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Updated SIP URI.
Changed ringin to Defiant.
fix.
Merge branch 'master' into heroku

Conflicts:
	.gitignore
Fixed number handling for SIP dialling.
Possible callerid fix.
Tweaked to use from_ header and to unquote callerid.
Possible fix to callerid?
Possible fix to callerid?