Remove wp-config.php from source control
Merge branch 'master' of https://github.com/travisscheidegger/mytelluridevacation.com

# By Aria Stewart
# Via Aria Stewart
* 'master' of https://github.com/travisscheidegger/mytelluridevacation.com:
  Update wordpress-seo to 1.5.2.6
  Update ajax-thumbnail-rebuild to 1.11
  Update wordpress-seo
  Update ajax-thumbnail-rebuild
  Install options framework into regular plugins, not muplugins
  Add theme as composer dependency

Conflicts:
	composer.lock
Wordpress 3.9