Update public-private.html.markdown
Update type-codio.html.markdown
not much
added .codiorun
codirun ammended
Update do-server.html.markdown

Remove extraneous 'will'
Upgraded capistrano
Created noop restart task
Updated bundle
Build!
Added build task for deployment and updated staging server
Using correct hostname
Updated deployment servers
Merge branch 'cap3'

* cap3:
  Updated deployment servers
  Using correct hostname
  Added build task for deployment and updated staging server
  Build!
  Updated bundle
  Created noop restart task
  Upgraded capistrano
Merge branch 'master' into backend

* master:
  Updated deployment servers
  Using correct hostname
  Added build task for deployment and updated staging server
  Build!
  Updated bundle
  Created noop restart task
  Upgraded capistrano
  Update do-server.html.markdown
  codirun ammended
  added .codiorun
  not much
  Update type-codio.html.markdown
  Update public-private.html.markdown

Conflicts:
	.codiorun
	build/about/index.html.gz
	build/blog/2013/03/building-with-grunt/index.html.gz
	build/blog/2013/03/codio-for-education/index.html.gz
	build/blog/2013/03/codio-is-live-and-kicking/index.html.gz
	build/blog/2013/03/collaboration-in-coding/index.html.gz
	build/blog/2013/03/index.html.gz
	build/blog/2013/03/our-twenty-percent-time/index.html.gz
	build/blog/2013/03/page/2/index.html.gz
	build/blog/2013/03/we-are-hiring-engineers/index.html.gz
	build/blog/2013/04/add-a-readme-file-to-your-project/index.html.gz
	build/blog/2013/04/annotations-released/index.html.gz
	build/blog/2013/04/coding-art-math/index.html.gz
	build/blog/2013/04/drag-and-drop-in-the-file-explorer/index.html.gz
	build/blog/2013/04/index.html.gz
	build/blog/2013/04/page/2/index.html.gz
	build/blog/2013/04/post-curriculum/index.html.gz
	build/blog/2013/04/say-it-with-a-sample/index.html.gz
	build/blog/2013/04/secure-previewing/index.html.gz
	build/blog/2013/04/sugata-mitra/index.html.gz
	build/blog/2013/05/emmet-support/index.html.gz
	build/blog/2013/05/index.html.gz
	build/blog/2013/05/inline-preview/index.html.gz
	build/blog/2013/05/mode-selection-and-ui-refresh/index.html.gz
	build/blog/2013/05/one-click-deployment/index.html.gz
	build/blog/2013/06/bug-fixed-in-50-minutes/index.html.gz
	build/blog/2013/06/coding-kids/index.html.gz
	build/blog/2013/06/colour-preview-and-picker/index.html.gz
	build/blog/2013/06/compiled-files/index.html.gz
	build/blog/2013/06/index.html.gz
	build/blog/2013/06/journey/index.html.gz
	build/blog/2013/06/moving-from-mercurial-to-git/index.html.gz
	build/blog/2013/06/page/2/index.html.gz
	build/blog/2013/06/real-time-coding/index.html.gz
	build/blog/2013/06/snippets/index.html.gz
	build/blog/2013/07/from-the-frontline-1/index.html.gz
	build/blog/2013/07/from-the-frontline-10/index.html.gz
	build/blog/2013/07/from-the-frontline-11/index.html.gz
	build/blog/2013/07/from-the-frontline-12/index.html.gz
	build/blog/2013/07/from-the-frontline-13/index.html.gz
	build/blog/2013/07/from-the-frontline-14/index.html.gz
	build/blog/2013/07/from-the-frontline-15/index.html.gz
	build/blog/2013/07/from-the-frontline-16/index.html.gz
	build/blog/2013/07/from-the-frontline-2/index.html.gz
	build/blog/2013/07/from-the-frontline-3/index.html.gz
	build/blog/2013/07/from-the-frontline-4/index.html.gz
	build/blog/2013/07/from-the-frontline-5/index.html.gz
	build/blog/2013/07/from-the-frontline-6/index.html.gz
	build/blog/2013/07/from-the-frontline-7/index.html.gz
	build/blog/2013/07/from-the-frontline-8/index.html.gz
	build/blog/2013/07/from-the-frontline-9/index.html.gz
	build/blog/2013/07/index.html.gz
	build/blog/2013/07/page/2/index.html.gz
	build/blog/2013/07/page/3/index.html.gz
	build/blog/2013/07/page/4/index.html.gz
	build/blog/2013/07/page/5/index.html.gz
	build/blog/2013/07/removing-apps/index.html.gz
	build/blog/2013/08/all-new-site/index.html.gz
	build/blog/2013/08/from-the-frontline-17/index.html.gz
	build/blog/2013/08/from-the-frontline-18/index.html.gz
	build/blog/2013/08/from-the-frontline-19/index.html.gz
	build/blog/2013/08/from-the-frontline-20/index.html.gz
	build/blog/2013/08/from-the-frontline-21/index.html.gz
	build/blog/2013/08/from-the-frontline-22/index.html.gz
	build/blog/2013/08/from-the-frontline-23/index.html.gz
	build/blog/2013/08/from-the-frontline-24/index.html.gz
	build/blog/2013/08/from-the-frontline-25/index.html.gz
	build/blog/2013/08/from-the-frontline-26/index.html.gz
	build/blog/2013/08/index.html.gz
	build/blog/2013/08/page/2/index.html.gz
	build/blog/2013/08/page/3/index.html.gz
	build/blog/2013/08/the-problem-with-promises/index.html.gz
	build/blog/2013/09/better-looking-annotations-and-full-screen/index.html.gz
	build/blog/2013/09/from-the-frontline-27/index.html.gz
	build/blog/2013/09/from-the-frontline-28/index.html.gz
	build/blog/2013/09/from-the-frontline-29/index.html.gz
	build/blog/2013/09/from-the-frontline-30/index.html.gz
	build/blog/2013/09/from-the-frontline-31/index.html.gz
	build/blog/2013/09/from-the-frontline-32/index.html.gz
	build/blog/2013/09/improving-performance-tab-switching/index.html.gz
	build/blog/2013/09/index.html.gz
	build/blog/2013/09/latest-and-greatest-why-we-only-support-modern-browsers/index.html.gz
	build/blog/2013/09/multiple-panels-new-editor-git-custom-keybindings-preferences/index.html.gz
	build/blog/2013/09/page/2/index.html.gz
	build/blog/2013/09/page/3/index.html.gz
	build/blog/2013/09/parse-integration/index.html.gz
	build/blog/2013/10/automatic-upload-ssh-key/index.html.gz
	build/blog/2013/10/ilos/index.html.gz
	build/blog/2013/10/index.html.gz
	build/blog/2013/10/more-creation-options/index.html.gz
	build/blog/2013/10/page/2/index.html.gz
	build/blog/2013/10/rsync-deployment-tab-context-menu-css-auto-completion/index.html.gz
	build/blog/2013/10/sign-in-up-via-github/index.html.gz
	build/blog/2013/11/auto-complete-for-any-language/index.html.gz
	build/blog/2013/11/deploy-preview/index.html.gz
	build/blog/2013/11/deploy-specific-files/index.html.gz
	build/blog/2013/11/git-improvements-checkout-and-revert/index.html.gz
	build/blog/2013/11/index.html.gz
	build/blog/2013/11/mbo-theme/index.html.gz
	build/blog/2013/11/page/2/index.html.gz
	build/blog/2013/11/page/3/index.html.gz
	build/blog/2013/11/pricing/index.html.gz
	build/blog/2013/11/quick-open/index.html.gz
	build/blog/2013/11/search-replace/index.html.gz
	build/blog/2013/11/snr/index.html.gz
	build/blog/2013/11/ssh-public-keys/index.html.gz
	build/blog/2013/11/ssh/index.html.gz
	build/blog/2013/12/command-bar/index.html.gz
	build/blog/2013/12/common-preferences/index.html.gz
	build/blog/2013/12/git-and-tease-of-what-is-to-come/index.html.gz
	build/blog/2013/12/index.html.gz
	build/blog/2013/12/tab-cycling/index.html.gz
	build/blog/2013/index.html.gz
	build/blog/2014/01/happy-new-year/index.html.gz
	build/blog/2014/01/index.html.gz
	build/blog/2014/01/subscriptions/index.html.gz
	build/blog/2014/index.html.gz
	build/blog/all/index.html.gz
	build/blog/index.html.gz
	build/blog/page/10/index.html.gz
	build/blog/page/11/index.html.gz
	build/blog/page/12/index.html.gz
	build/blog/page/13/index.html.gz
	build/blog/page/14/index.html.gz
	build/blog/page/15/index.html.gz
	build/blog/page/2/index.html.gz
	build/blog/page/3/index.html.gz
	build/blog/page/4/index.html.gz
	build/blog/page/5/index.html.gz
	build/blog/page/6/index.html.gz
	build/blog/page/7/index.html.gz
	build/blog/page/8/index.html.gz
	build/blog/page/9/index.html.gz
	build/blog/tags/changelog/index.html.gz
	build/blog/tags/changelog/page/2/index.html.gz
	build/blog/tags/changelog/page/3/index.html.gz
	build/blog/tags/changelog/page/4/index.html.gz
	build/blog/tags/changelog/page/5/index.html.gz
	build/blog/tags/changelog/page/6/index.html.gz
	build/blog/tags/changelog/page/7/index.html.gz
	build/blog/tags/engineering/index.html.gz
	build/blog/tags/engineering/page/2/index.html.gz
	build/blog/tags/from-the-front-line/index.html.gz
	build/blog/tags/from-the-front-line/page/2/index.html.gz
	build/blog/tags/from-the-front-line/page/3/index.html.gz
	build/blog/tags/from-the-front-line/page/4/index.html.gz
	build/blog/tags/from-the-front-line/page/5/index.html.gz
	build/blog/tags/from-the-front-line/page/6/index.html.gz
	build/blog/tags/watercooler/index.html.gz
	build/blog/tags/watercooler/page/2/index.html.gz
	build/css/boilerplate-101bd59e.css.gz
	build/css/main-76a204dc.css.gz
	build/docs/annotations/adding-annotation/index.html.gz
	build/docs/annotations/annotations-file/index.html.gz
	build/docs/annotations/auto-start/index.html.gz
	build/docs/annotations/embedding/index.html.gz
	build/docs/annotations/example-project/index.html.gz
	build/docs/annotations/example/index.html.gz
	build/docs/annotations/explore/index.html.gz
	build/docs/annotations/helpers/index.html.gz
	build/docs/annotations/index.html.gz
	build/docs/annotations/md-overview/index.html.gz
	build/docs/annotations/own-ide/index.html.gz
	build/docs/annotations/readme-md/index.html.gz
	build/docs/annotations/tour/index.html.gz
	build/docs/annotations/videos/index.html.gz
	build/docs/annotations/why/index.html.gz
	build/docs/annotations/widget/index.html.gz
	build/docs/autocomplete/index.html.gz
	build/docs/back-end/do-server/index.html
	build/docs/back-end/do-server/index.html.gz
	build/docs/back-end/index.html.gz
	build/docs/back-end/node-python/index.html.gz
	build/docs/back-end/php/index.html.gz
	build/docs/back-end/quick-start/index.html.gz
	build/docs/back-end/rsync-suggestion/index.html.gz
	build/docs/back-end/wordpress/index.html.gz
	build/docs/bower/accessing/index.html.gz
	build/docs/bower/consuming/index.html.gz
	build/docs/bower/finding/index.html.gz
	build/docs/bower/index.html.gz
	build/docs/bower/more-bower/index.html.gz
	build/docs/bower/remove/index.html.gz
	build/docs/bower/updating/index.html.gz
	build/docs/browser-support/index.html.gz
	build/docs/bugs/index.html.gz
	build/docs/command-bar/index.html.gz
	build/docs/compiling/index.html.gz
	build/docs/compiling/one-file/index.html.gz
	build/docs/compiling/other/index.html.gz
	build/docs/compiling/overview/index.html.gz
	build/docs/console/accessing-others/index.html.gz
	build/docs/console/accessing/index.html.gz
	build/docs/console/creating/index.html.gz
	build/docs/console/index.html.gz
	build/docs/console/project-description/index.html.gz
	build/docs/cp-fiddle/index.html.gz
	build/docs/deployment/basepath/index.html.gz
	build/docs/deployment/create/index.html.gz
	build/docs/deployment/deploy/index.html.gz
	build/docs/deployment/deployment-keys/index.html.gz
	build/docs/deployment/deployment-ssh/index.html.gz
	build/docs/deployment/history/index.html.gz
	build/docs/deployment/index.html.gz
	build/docs/deployment/specific-files/index.html.gz
	build/docs/deployment/type-codio/index.html.gz
	build/docs/deployment/type-ftp/index.html.gz
	build/docs/deployment/type-nj/index.html.gz
	build/docs/deployment/type-parse/index.html.gz
	build/docs/deployment/type-rsync/index.html.gz
	build/docs/deployment/type-sftp/index.html.gz
	build/docs/emmet/emmet-abbreviations/index.html.gz
	build/docs/emmet/emmet-actions/index.html.gz
	build/docs/emmet/emmet-docs/index.html.gz
	build/docs/emmet/emmet-ref/index.html.gz
	build/docs/emmet/index.html.gz
	build/docs/feature-roundup/index.html.gz
	build/docs/getting-started/index.html.gz
	build/docs/git-viewing/index.html.gz
	build/docs/git/active-branch/index.html.gz
	build/docs/git/coming/index.html.gz
	build/docs/git/git-primer/index.html.gz
	build/docs/git/github-keys/index.html.gz
	build/docs/git/index.html.gz
	build/docs/git/intro/index.html.gz
	build/docs/git/no-remote/index.html.gz
	build/docs/git/remotes/index.html.gz
	build/docs/git/resources/index.html.gz
	build/docs/git/supported/index.html.gz
	build/docs/git/using-git/index.html.gz
	build/docs/ide-beautify/index.html.gz
	build/docs/ide/code-editor/color-preview/index.html.gz
	build/docs/ide/code-editor/ide-beautify/index.html.gz
	build/docs/ide/code-editor/ide-force-lang/index.html.gz
	build/docs/ide/code-editor/index.html.gz
	build/docs/ide/code-editor/kb-shortcuts/index.html.gz
	build/docs/ide/code-editor/search-replace/index.html.gz
	build/docs/ide/ide-general/add-file/index.html.gz
	build/docs/ide/ide-general/add-folder/index.html.gz
	build/docs/ide/ide-general/delete-folder/index.html.gz
	build/docs/ide/ide-general/dragging/index.html.gz
	build/docs/ide/ide-general/editing/index.html.gz
	build/docs/ide/ide-general/exiting/index.html.gz
	build/docs/ide/ide-general/export/index.html.gz
	build/docs/ide/ide-general/fork/index.html.gz
	build/docs/ide/ide-general/index.html.gz
	build/docs/ide/ide-general/inline-preview/index.html.gz
	build/docs/ide/ide-general/quick-open/index.html.gz
	build/docs/ide/ide-general/readme-md/index.html.gz
	build/docs/ide/ide-general/real-time/index.html.gz
	build/docs/ide/ide-general/saving/index.html.gz
	build/docs/ide/ide-general/templates/index.html.gz
	build/docs/ide/ide-general/upload/index.html.gz
	build/docs/ide/index.html.gz
	build/docs/index.html.gz
	build/docs/inline-preview/index.html.gz
	build/docs/panels/full-screen/index.html.gz
	build/docs/panels/index.html.gz
	build/docs/panels/panel-actions/index.html.gz
	build/docs/public-private/index.html.gz
	build/docs/salesforce/index.html.gz
	build/docs/salesforce/sf-account/index.html.gz
	build/docs/salesforce/sf-create/index.html.gz
	build/docs/salesforce/sf-ide/index.html.gz
	build/docs/salesforce/sf-logs/index.html.gz
	build/docs/salesforce/sf-pull/index.html.gz
	build/docs/salesforce/sf-push/index.html.gz
	build/docs/settings-prefs/account-settings/account-delete/index.html.gz
	build/docs/settings-prefs/account-settings/acct-github/index.html.gz
	build/docs/settings-prefs/account-settings/index.html.gz
	build/docs/settings-prefs/account-settings/password/index.html.gz
	build/docs/settings-prefs/account-settings/profile/index.html.gz
	build/docs/settings-prefs/account-settings/public-key/index.html.gz
	build/docs/settings-prefs/codio-prefs/index.html.gz
	build/docs/settings-prefs/index.html.gz
	build/docs/settings-prefs/permissions/index.html.gz
	build/docs/settings-prefs/prefs-list/index.html.gz
	build/docs/settings-prefs/project-prefs/index.html.gz
	build/docs/settings-prefs/project-settings/index.html.gz
	build/docs/sharing/index.html.gz
	build/docs/sponblog/index.html.gz
	build/docs/ssh/index.html.gz
	build/docs/ssh/quick-connect/index.html.gz
	build/docs/ssh/ssh-manager/index.html.gz
	build/docs/subscriptions/index.html.gz
	build/examples/index.html.gz
	build/home-php/index.html.gz
	build/home-salesforce/index.html.gz
	build/home-sponblog/index.html.gz
	build/home-webdesign/index.html.gz
	build/home-wordpress/index.html.gz
	build/index.html.gz
	build/js/doc_search/base-83c2094a.js.gz
	build/js/doc_search/tipuesearch-a1ed873b.js.gz
	build/js/home-f2c055f3.js.gz
	build/js/home/submenu-d3ff75ff.js.gz
	build/js/lib/cookie-2b460dd9.js.gz
	build/js/lib/fancybox.min-3c42ad98.js
	build/js/lib/fancybox.min-3c42ad98.js.gz
	build/js/lib/jquery-transit-18c1c0e4.js.gz
	build/js/lib/md5-db8a767f.js.gz
	build/js/lib/utilities-21062015.js.gz
	build/js/main-9939edd3.js.gz
	build/js/vendor/jquery.min-33074654.js.gz
	build/js/vendor/protofluid.min-2ff1c5b1.js.gz
	build/js/vendor/rainbow-7edb7a7e.js.gz
	build/js/vendor/rainbow/linecount-df5c9658.js.gz
	build/js/vendor/scrollspy-29bb7999.js.gz
	build/js/vendor/turbolinks-9d24f214.js.gz
	build/legal/aup/index.html.gz
	build/legal/copyright/index.html.gz
	build/legal/faqs/index.html.gz
	build/legal/index.html.gz
	build/legal/privacy/index.html.gz
	build/legal/refund/index.html.gz
	build/legal/service-terms/index.html.gz
	build/legal/sponblog/index.html.gz
	build/legal/tmusage/index.html.gz
	build/lp/cp-fiddle/index.html.gz
	build/lp/github-ide/index.html.gz
	build/lp/parse/index.html.gz
	build/lp/salesforce/index.html.gz
	build/partials/home-php/all-you-need-php/index.html.gz
	build/pricing/index.html.gz
	build/share-your-code/index.html.gz
	source/docs/back-end/do-server.html.markdown