Merge branch 'master' of https://github.com/KernelCorp/vector

Conflicts:
	app/assets/stylesheets/application.css.sass
Merge branch 'master' of https://github.com/KernelCorp/vector