WIP
1yr reservations
Move billing templates to correct locn & fix typos
Fixed test  errors
Disable user reservations for now
Merge pull request #26 from kili/1yr_packages

Move templates to correct location, fix typos and refactor the same