updates
Merge branch 'master' of ssh://github.com/schuppo/dotfiles

Conflicts:
	IdeaIC13/options/appComponentVersions.xml
	IdeaIC13/options/feature.usage.statistics.xml
	IdeaIC13/options/jdk.table.xml
	IdeaIC13/options/options.xml
	IdeaIC13/options/other.xml
	IdeaIC13/options/scala.xml
	IdeaIC13/options/statistics.application.usages.xml
	IdeaIC13/options/vim_settings.xml
	sublime2/User/Package Control.sublime-settings
solves merge conflict