Add back global $wpdb;
Merge branch 'master' of github.com:vinkla/wordpress-boilerplate

* 'master' of github.com:vinkla/wordpress-boilerplate:
  Fix naming bug.