Updating .gitignore, and default settings file.
Removing Flexslider submodule folder
Merge branch 'master' into develop