More links!
Merge branch 'master' of github.com:patrickdavey/vimwiki

Conflicts:
	Rails.wiki
	Ruby.wiki
	css - responsive - design Tips.wiki