ignore .swp files in .gitignore
ignore files that end with "~"
Merge branch 'master' of https://github.com/abangratz/penpusher-admin

:q
Merge branch 'master' of https://github.com/abangratz/penpusher-admin

Conflicts:
	.gitignore

:q
removing swp file
refactors use of Kramdown in article.rb via injection
Merge branch 'master' into article_editing_20130224

Conflicts:
	app/models/article.rb