Updated the keynote presentation
Merge branch 'master' of https://github.com/calypsoh13/fractalsite

Conflicts:
	docs/plasma.key
Add tastypie and dependencies to requirements.txt
Use backbone router to start fractal creation page

Now, the creation page is located at /fractals/#create
Don't ignore docs/plasma.key
Track plasma.key