Removed git merge-conflict lines
Increase max_length to 75 for CharField
Move map to below address fields
Center/zoom on multiple markers when geocoding returns multipls results
Merge pull request #167 from notthatbreezy/topic/update-db-schema

Update DB Schema, Fix Import Script
Update install/developer instructions to use ansible
Delete unused install/sql scripts

No longer necessary with the ansible deployment setup
Fix directory/path structure
Remove media/static root settings, use local_settings.py instead
Fix incorrect prefix for languages in slugfield of topic
Add vagrant file with settings

- Uses a different box than default precise32 to get
around annoying locale settings; the precise32-server
box is the same one used by Amazon EC2 AMIs
- Set up provisioning with Ansible
Add file for Ansible to know which servers to push to

Will need to update this once we get staging/production servers
set up. Currently only set up for use with vagrant.
Add gunicorn config template
Add nginx config template
Add local_settings.py template
Playbook for setting up nginx and gunicorn
Add playbook variables specific to [vagrant] host
Add playbook for Django set up
Add playbook for database set up
Add playbook to install system/python requirements