Merge remote-tracking branch 'upstream/master'
Remove many ending tabstops, as they tend to cause more problems than they solve.
Merge pull request #91 from mclee/master

added a few inline snippets for templating
Merge pull request #92 from mclee/master

A few more snippets for php
Merge pull request #90 from smt/html-snippets

Html snippets
Current Rails version (3) doesn't have RAILS_DEFAULT_LOGGER anymore. log snippet for Rails 3.x, log2 snippet for Rails 2.x
Merge pull request #93 from sickill/master

log snippet for ruby updated
There should be no space between the name of a function and the "("

See here: http://javascript.crockford.com/code.html
Merge pull request #94 from sickill/js-improvements

There should be no space between the name of a function and the "("
Haskell snippets
Merge pull request #96 from jb55/haskell

Haskell snippets
more sophisticated module version
Added Haskell import snippets
Delete a minus sign from eruby tags

We are no longer need it since Rails 3.
Add eruby snippet for .each
Merge pull request #99 from rekky/master

Adjust eruby snippets
added octopress snippets for markdown files
added pullquote snippet
use parent instead of base
experimenting with a couple new package constructs