Auto-templating: type and provider (only tested with dropbox, might but on evernote)
Update style timeline
Merge branch 'regex-templating'
Merge branch 'master' of github.com:pmdartus/sFetch-host

Conflicts:
	public/js/controllers.js
	views/partials/timeline.jade