**WARNING** This commit will break your site

Altered 2 files with important settings information in them to take
them out of version control. This should make updating your site
from the repository slightly easier in future, but will break your site!

Follow the instructions in INSTALL.txt to fix.
(edit the new files to replace the old ones!)
Sets gitignore to ignore settings.php and functions/connect.php
Merge branch 'master' into api_changes