Add wp-config.php to .gitignore
Merge branch 'master' of github.com:stephenchapman/sc

merge necessary due to wp-config.php removed on web rep
merge necessary due to wp-config.php removed on web repoo