- 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
syntactic changes from comments by @damianavila
Merge remote-tracking branch 'origin/master' into feature/robust_reloader

Conflicts:
	bokeh/server/__init__.py
Merge pull request #605 from ContinuumIO/feature/robust_reloader

Feature/robust reloader