Added TAI parsing ability time.parse_time
Reformmatting changes
Edited docstring of parse_time parameters
lets see
time_format added to parse_time
parse_time parameter time_format added
Removed TAI parsing ability from parse_time
Minor change
float interpreted as utime
changes incorporated
merge conflicts resolved
Docstring corrected
break_time method parameter defaults to 'now' from now on
Make CROTA2 default to 0.

If no rotation information in the header, the default is 0.
Fixed broken link for Matplotlib

Matplotlib link was broken.  Removed the double http:// to fix it.
Use union merge strategy for the changelog
Merge pull request #1149 from ayshih/changelog

Use union merge strategy for the changelog
merge conflict removal
Merge pull request #1144 from jaylenw/master

[DocFix]: Fixed broken link for Matplotlib in Documentation
Merge pull request #1142 from Cadair/crota_default

Make CROTA2 default to 0.