Merge pull request #5 from adam-vessey/7.x

Port code to Drupal 7.
Fix the CSS/wrapping issue, for real this time.