Fix activation errors due to missing functions file
Merge branch 'pr/n3_Faison' into release/1.5

Conflicts:
	wp-seo-main.php
Moved capability functions to the functions file and removed superfluous add_action
Pff... final fix for getting the activation working

I *really* detest the way WP does this.... grr....
Tested and found working now.
Prevent error notices x2
Make sure title_test option value is always a positive nr
Small changes to better facilitate add-on plugins which want to use the WPSEO_Meta and WPSEO_Metabox base classes
Mini-bug fix where $meta_length might not be the right value
Adjust Tax meta options class to allow for add-on plugins to hook in
Prevent some error notices
Small fixes after testing with Video SEO
Code style...
typo
Fix issue #669 - stripping of octets breaks our %%variables%%

Also fixed potential similar issue with url validation and created helper function for this
Whitespace / code style
Oh dear.... bug in title test, no wonder it didn't work well
typo... WPSEO_Option **not** WPSEO_Options...
Two more...
Fix part 2 of issue #669#issuecomment-35450820 - slashes added in front of values

Escaping no longer needed as changed from double to single quotes
Fixed issues with import of WPSEO native settings and other import/export page related issues

Fixes issue#669#issuecomment-35450820 part 3

Bugs from v1.5:
* Clean imported settings on import
* Fixed some bugs in the clean up routines
    - `wpseo` presstrend options value error
    - better cleaning of `wpseo_titles` for variable variable keys while still retaining possibly valid keys for post types/taxonomies which may not be registered yet
    - wpseo_internallinks taxonomy/post type values which could be valid were reset to default too easily
    - no need to continually change the fbconnectkey
* Fixed potential 'array index not set' issues in WPSEO_Options

Bugs from previous WPSEO:
* Fixed: Use native WP `unzip_file()` rather than calling `PclZip` directly +using the uploads directory rather than `WP_CONTENT` fixes import failure/permissions issue
* Fixed: On failure or import, uploaded file/created directory would not always be removed
* Fixed: Better error message feedback to user on import failure
* Fixed: Rest of page after 'export settings' would never load when export button had been clicked

Also:
* Readme: Added specific credits to testers which have send in actionable v1.5 bug reports