Fixed test to reflect new concatenation needs
Merge branch 'dev'

Conflicts:
	lightcurve/tests/test_object.py
Merge branch 'dev'
Merge branch 'dev'
build extension in travis setup
fixed typo in travis settings
trying something else
Fixes for travis build, re-refactor of get_both_filenames and added test case