Upgrade to 3.7.1 without any mods.  Also, upgrade WP-Geo and Supercache plugins.  Upgrade 2011, 2012, and Responsive themes.
Remove unused htaccess rewrite for login (possible relic before auth layer rewrite).  Hide user_login from profile page.  Disable modal login.
Merge branch 'feature/wordpress_3.7.1' into develop
Reorganize main source into a subfolder so that puppet, shell script, and deployment code can be on same level.
Move bootstrap file to project root.  Add in example of a .conf file for host machine to proxy requests to port that VM is forwarding to.  Add a README with setup instructions.  Other minor fixes/changes.
Merge pull request #1 from Harvard-University-iCommons/feature/reorg_subfolders

Feature/reorg subfolders
Merge branch 'develop' into staging
Update file permissions for mounted wordpress folder in Vagrantfile so that apache user can write to files (for updates, additions, etc.).  Add VBox options to fix DNS slowness.  Move more data config stuff into common.yaml and remove puppet backend support from hiera.yaml.  Default Apache "SiteEnabled" to off so that mods to static files actually show up in browser.  Remove unused puppet hiera module.
Update bbpress plugin and responsive theme.  Couple of mods to popup-disclaimer plugin: load initial TOS view through a footer hook instead of using AJAX calls; use included versions of jquery-ui and jquery instead of relying on Google cdn; add css to ensure modal dialog's z-index is high.
Merge branch 'develop' into staging
Explicitly add thickbox to permissions plugin as updated version of WP doesn't include thickbox by default anymore (as of 3.6?).  Clean up how scripts are imported as well, using register_style/register_script and enqueue_style/enqueue_script respectively.  Similar minor cleanup in stats plugin.  For now, comment out option when deploying to use remote cache.
Merge branch 'develop' into staging
Move popup disclaimer plugin to class-based structure.  Add an options page that allows someone (probably QA) to show the TOS popup by appending a query parameter to a wordpress URL.  Add jquery-ui css to allow dialog to show up with correct styles.
Merge branch 'develop' into staging
Add a plugin that disables all automatic updates of plugins, themes, core, and translations.  We're taking the responsibility for all of these kinds of updates.
Merge branch 'develop' into staging
Add environment and fqdn levels to hierarchy in hiera config.  Integrate node assignment into site.pp and use hiera_include to get the proper classes for the current node.  Split wordpress module into db and web subclasses whose inclusion may be separated out in a multi-node environment.
Use pre_user_login hook to encrypt PIN instead of manually encrypting pin on calls to wp_insert_user.  Add table creation to registration hook of hu_permissions plugin.
Merge pull request #2 from Harvard-University-iCommons/feature/user_login_encryption

Use pre_user_login hook to encrypt PIN instead of manually encrypting pi...
Merge pull request #3 from Harvard-University-iCommons/develop

Merge changes