remove buttons working with bootstrap. added to storyform.
commiting for it's own sake
Merge remote-tracking branch 'origin/master'

Conflicts:
	passiveaggressivenews/passiveaggressivenews/settings.py