updated config to work with remote develop server
Merge branch 'develop' of github.com:noslouch/shanghai-home
Merge branch 'master' of ~/git/shanghai
Merge branch 'master' of ~/git/shanghai

Conflicts:
	nyush/expressionengine/config/config.php
Merge branch 'master' of ~/git/shanghai
updated segment to load chat script
Merge branch 'master' of ~/git/shanghai
fix libraryHelp.js path
Merge branch 'master' of ~/git/shanghai
style update to chat widget
Merge branch 'master' of ~/git/shanghai
updating styles for primo
commting changes
test commit
Merge branch 'master' of ~/git/shanghai
tabs and stuff
Merge branch 'master' of ~/git/shanghai
bobcat styles