updates
flask has now overtaken every other framework i've been using, so now it's time to put it in the conf
Merge branch 'master' of github.com:jjshabs/devenv

Conflicts:
	shells/bashrc_aggregate
	vim/vimrc