Lots of messing around to get elpy working

Currently pegged at 1.3.0 - need to fix that once it is working in elpa
properly