Updated wordpress to version 3.7
Updated the config file
Merge branch 'master' of github.com:maikeldaloo/mywordpress

* 'master' of github.com:maikeldaloo/mywordpress:
  Updated the reference to the custom post types file as it was renamed.
  Update and rename custom_type_staff.php to custom_post_types.php