Updated delete data to use the instance id instead of the uuid which can be ducplicated - fixes #927
Merge branch 'master' into 927_delete_by_id
FIxed tesst to use id param for delete_data url instead of mongo api style queries
pep8
Merge branch 'master' into 927_delete_by_id

* master: (40 commits)
  darker button in active state
  Update map.css
  toggle option added to buttons
  basic functionality added/still need to add css properties
  google docs export list link
  ensure the URL exists
  redirect to google docs url
  use temporary file when storage backend is s3
  display error message if error occurs
  save file dir on export generation
  GDOC support on export list
  generate xls export for GDOCs as well
  added GDOC support to export model
  Implemented language changes on column picker - fixes #955
  Updated query mongo to enclose query params in an  - fixes #622
  updated youtube video hieght, keep ratio
  updated styling for resources view
  added intro video
  Used pasrse with file object instead of a parseString with a read - fixes #1007
  Updated xml outpuch check to use the xml dom API
  ...

Conflicts:
	main/views.py
Merge branch 'master' into 927_delete_by_id

* master:
  Updated csv and xls data urls to match new named url patterns
  Re-enabled nosetests
  pep8 cleanup
  pep8
  pep8 cleanup, raise exceptions
  return a valid OpenRosaResponse for the head request
  async kml export support
  separated kml export data generation into a function of its own
  link to zip export list
  delete zip exports after a specified period
  task to generate attachments zip export
  generate attachments zip export function
  add zip export type and mime
  refactored attachment zip to a utils function
  create zip file from Attachments model
  get full filepath of an attachment
  for large size submissions, ensure attachments are saved, as the submission is treated as a duplicate
  handle ZeroDivisionError exceptions, occurs when the height  and thumbnail height are the same
update test to use instance id on delete
Merge pull request #1015 from modilabs/927_delete_by_id

Updated delete data to use the instance id instead of the uuid which can be ducplicated - fixes #927