add ithemes security
refactored with htaccess and content folder
config merge
conflcts did merge properly
remove sync
Merge branch 'master' of github.com:jchamb/hbwp