some 80 column reformatting
update terminus year in the license, now that there are some 2014 commits
Merge remote-tracking branch 'origin/master'
address issue #20
resolve issue #20
Merge remote-tracking branch 'origin/master'