Added .pem files to gitignore
Configured basic db settings
Merge branch 'master' of https://github.com/thomasgwatson/mapwarper

Conflicts:
	config/database.yml