Fix numpy/scipy fight
Update docs, start to switch to haystack
Add in search capability
Update gitignore to not add in whoosh index files
Fix search, add in templates
Index more fields
Add in some docs
Update docs to reflect machine-learning open source
Update docs to reflect open source of machine learning repo
Merge remote-tracking branch 'origin/master' into vik/add-docs

Conflicts:
	docs/installation/installation_overview.rst
Naming issue
Remove extraneous debug statements
Merge pull request #24 from edx/vik/add-docs

Vik/add docs