Merge branch 'release/1.0b1.4.1.1' into develop
changed database transiting planet to use is transiting variable
added a test for a calculated parameter (first of many) and refmorated hierarchy error message to include planet name
Merge branch 'hotfix/1.0b1.4.1.2' into develop
removed read me instructions for beta (--pre) and added testing for python 3.4
fix to stop travis.ci error     # TclError: no display name and no $DISPLAY environment variable. Must be called first by setting up the display variable
Merge branch 'release/1.0'