Commiting changings before AWS migration pull
Merge github.com:roflzok/FG

Conflicts:
	.htaccess
	wp-config.php
	wp-content/cache/config/master.php
	wp-content/w3tc-config/master.php
AWS migration complete -- backing up before looking to scale over the weekend.