re various requested changes
changes to the configurable items
import now button
ability to specify only one year
merge master
Merge pull request #2 from yiendos/request_changes

Request changes