Updated tests to work with new file structure changes.
Merge branch '1.0' of https://github.com/plotly/python-api into 1.0

Conflicts:
	plotly/plotly/plotly.py