Initial commit
Fixed stuff.
Merge branch 'master' of https://github.com/mbg/vp-nov2014 into HEAD