Update vagrant
Merge remote-tracking branch 'upstream/master'
Add gem 'wysihtml5-rails'
Require wysihtml5 in JS manifest file
Comment out ClEditor code
wysihtml5 base implementation

* No styles/formatting included.≈
wysihtml5 base implementation

* No styles/formatting included.
Editor button options to include - base set.
Merge branch 'test' into wysihtml5

Conflicts:
	app/views/submissions/_form.html.haml
Add CSS to buttons and related input elements.
Merge branch 'test' into wysihtml5
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into wysihtml5 branch.

* make sure I have all chadoh's changes added into my 'wysihtml5'
  branch before I submit pull request.
Redo wysihtml5 design implementation

 * Remove blue 'outline' property from form elements that receive focus
 * Stretched out wysi toolbar buttons a bit to fill editor width
 * Removed toolbar button-group box shadow, but kept gray border
 * Re-positionedn (absolute) image and web link creator elements
 * Added pointer-hand when mousing over 'OK' and 'Cancel' link creator
   options
 * Added margin below wysi editor, above the "Or, submit an image"
 * button
 * Removed 'Title' label from title input form
 * Add font formatting so that user input into the Title box looks like
   an actual h1/title
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into wysihtml5
Rebuild wysihtml5 implementation and layout

 * Remove bootstrap style navbar implementatation which utilizes ul/li
 elements. Instead, I use the existing anchor elements and use the
 display: inline-block css property to add styling as needed.
   * The result is cleaner, more concise html.
 * Rebuilt the CSS stylesheet from scratch.
   * Class and ID names are more descriptive and used correctly.
   * Selector names 'dasherized'
   * Utilized Mixins and Variables.
   * These changes shortened the stylesheet from 117 to 72 lines.
 * The 'Title' submission section uses the default H1 styles. This is
 achieved by nesting the textarea inside an H1 element.
   * Added 'Title' label back in.
 * Remove placeholder text for both 'Title' and 'Body' submission fields
 * Page displays correctly on Chrome, Firefox, Safari. Not sure about IE
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into wysihtml5
Add tabindex attributes. Increase editor height.

 * tabindex order is Title, Body, Your Name, Your Email Address
 (1,2,3,4)
 * Editor height is now 400px
 * Remove textarea resize handle on Title field