- pulled out settings into module
- added robust cmd line reload option
- added script arg to load an additional script
- added more functionality into settings which isn't based on command line params
- split up server startup into smaller functions
- implemented robust reloader
- modified js code so that we can send messages to it to tell it to reload
imports at the top of the file
reload functionality moved to serverrun.coffee
fixing tests - set params on settings, rather than passing in args
loading a single object from the server
intial add of conda and binstar recipes
clean up
fixing conda recipe
forgot pushd/popd calls
adding nodejs and grunt requirements
switching from distribute to setuptools
fixing .binstar.yml file.  conda convert now builds directories automatically
adding python 3 engine
changing name of pkg
doubling up commands may help with something?
Fixes issue 592
Replaced tabs with spaces
Added support for mixed list in tools. Modified an example for proof of concept
Replaced tabs by spaces..
Merge branch 'master' of https://github.com/tarzzz/bokeh into issue-592

Conflicts:
	bokeh/plotting_helpers.py