Trailing whitespace.
Fix embedded form margin.
Merge branch 'master' of git://github.com/Tactics/FormBundle