Merge branch 'hotfix/2.0.2'
Merge branch 'release/2.1'
Re-adding favicon.png.
Merge branch 'hotfix/2.1.1'
Merge branch 'hotfix/2.1.1' into development
Added Penzias and Wilson. More mention of Laravel.
Merge branch 'development' of bitbucket.org:NemesisVex/vigilant-media into development
Replaced masthead with Bootstrap navbar.
Updating resume.
Merge branch 'hotfix/2.1.2'
Merge branch 'hotfix/2.1.2' into development

Conflicts:
	public/content/resume.xml
Merge branch 'release/2.1.3'
Merge branch 'development' of bitbucket.org:NemesisVex/vigilant-media into development
Added WordPress contributions.
Corrected WordPress branding.
Merge branch 'hotfix/2.1.4'
Merge branch 'hotfix/2.1.4' into development
Changing Drupal references to WordPress.
Merge branch 'hotfix/2.1.5' into development
Merge branch 'development' of bitbucket.org:NemesisVex/vigilant-media into development