Fix plugins not being enqueued in plugins.php
Fix travis phpcs error [ci-skip]
A bit o' code formatting
Merge pull request #419 from x-team/issue-411

Fix plugins not being enqueued in plugins.php
Merge branch 'develop' into issue-65

Conflicts:
	includes/admin.php