some message
Merge branch 'master' of http://github.com/n-hutton/ubuntu-setup

some message
Merge branch 'master' of http://github.com/n-hutton/ubuntu-setup
vimrc uses solarized by default, no bundle