turned off .gitignore

Signed-off-by: Dom Pascal <dom@dompascal.com>
Merge branch 'MASTER' of github.com:dompascal/surplus-city

Signed-off-by: Dom Pascal <dom@dompascal.com>

Conflicts:
	.gitignore
	mysql/local.carpetsandbedslondon.co.uk_wp_dev_2013-09-16.sql.gz