Merge pull request #11 from ucb-ist-drupal/develop

Merge user instructions improvements and a bunch of commits that should've been merged for the alpha4 release
Fix the overlay problem with drupal_set_message
Prepare 2.0-alpha5 release
Fix merge conflict on version
Merge pull request #13 from bwood/master

Fix the overlay problem with drupal_set_message. Take 2