rabl syntax
Merge remote-tracking branch 'origin/master' into qd-rabl-syntax

Conflicts:
	vimrc
Merge pull request #27 from crowdtap/qd-rabl-syntax

rabl syntax + whitespace