fixed merge conflict
added stubbed vision app
added simplecv dependancies
added simple streaming server command
cleanup
fixed directory name
added vision app to settings
Merge branch 'develop' of github.com:qoda/raspberrybot into feature/vision/simple

Conflicts:
	raspberrybot/templates/base.html
added videostream to server startup script